summaryrefslogtreecommitdiffstats
path: root/libavcodec/extract_extradata_bsf.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2018-03-11 13:45:05 -0300
committerJames Almer <jamrial@gmail.com>2018-03-11 15:39:47 -0300
commit9c6dd9d6248897a2d8dd4ede948c166e5a579a4b (patch)
treee24182d97428f1c24ab4fb73d115396ca8d7d4e0 /libavcodec/extract_extradata_bsf.c
parentaba437a6d0a7e0d9bafc6a2170ddd31d19d6c4d5 (diff)
downloadffmpeg-streaming-9c6dd9d6248897a2d8dd4ede948c166e5a579a4b.zip
ffmpeg-streaming-9c6dd9d6248897a2d8dd4ede948c166e5a579a4b.tar.gz
avcodec/extract_extradata: move the reference in the bsf internal buffer
There's no need to allocate a new packet for it. Reviewed-by: Mark Thompson <sw@jkqxz.net> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/extract_extradata_bsf.c')
-rw-r--r--libavcodec/extract_extradata_bsf.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c
index 4e2d601..1c386be 100644
--- a/libavcodec/extract_extradata_bsf.c
+++ b/libavcodec/extract_extradata_bsf.c
@@ -279,24 +279,23 @@ static int extract_extradata_init(AVBSFContext *ctx)
return 0;
}
-static int extract_extradata_filter(AVBSFContext *ctx, AVPacket *out)
+static int extract_extradata_filter(AVBSFContext *ctx, AVPacket *pkt)
{
ExtractExtradataContext *s = ctx->priv_data;
- AVPacket *in;
uint8_t *extradata = NULL;
int extradata_size;
int ret = 0;
- ret = ff_bsf_get_packet(ctx, &in);
+ ret = ff_bsf_get_packet_ref(ctx, pkt);
if (ret < 0)
return ret;
- ret = s->extract(ctx, in, &extradata, &extradata_size);
+ ret = s->extract(ctx, pkt, &extradata, &extradata_size);
if (ret < 0)
goto fail;
if (extradata) {
- ret = av_packet_add_side_data(in, AV_PKT_DATA_NEW_EXTRADATA,
+ ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
extradata, extradata_size);
if (ret < 0) {
av_freep(&extradata);
@@ -304,10 +303,10 @@ static int extract_extradata_filter(AVBSFContext *ctx, AVPacket *out)
}
}
- av_packet_move_ref(out, in);
+ return 0;
fail:
- av_packet_free(&in);
+ av_packet_unref(pkt);
return ret;
}
OpenPOWER on IntegriCloud