[FFmpeg-devel] [PATCH 5/6] avcodec/bsf: use av_packet_make_ref to ensure packets are ref counted
James Almer
jamrial at gmail.com
Sun Mar 25 07:03:38 EEST 2018
Simplifies code.
Signed-off-by: James Almer <jamrial at gmail.com>
---
libavcodec/bsf.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c
index 05a44e2e31..02550b01d7 100644
--- a/libavcodec/bsf.c
+++ b/libavcodec/bsf.c
@@ -174,6 +174,8 @@ int av_bsf_init(AVBSFContext *ctx)
int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt)
{
+ int ret;
+
if (!pkt || (!pkt->data && !pkt->side_data_elems)) {
ctx->internal->eof = 1;
return 0;
@@ -188,15 +190,10 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt)
ctx->internal->buffer_pkt->side_data_elems)
return AVERROR(EAGAIN);
- if (pkt->buf) {
- av_packet_move_ref(ctx->internal->buffer_pkt, pkt);
- } else {
- int ret = av_packet_ref(ctx->internal->buffer_pkt, pkt);
-
- if (ret < 0)
- return ret;
- av_packet_unref(pkt);
- }
+ ret = av_packet_make_ref(pkt);
+ if (ret < 0)
+ return ret;
+ av_packet_move_ref(ctx->internal->buffer_pkt, pkt);
return 0;
}
--
2.16.2
More information about the ffmpeg-devel
mailing list