diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-07-10 23:08:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-19 18:20:44 +0200 |
| commit | fee1bffbc26ea6c39e11db0c58f3df9dd8fa84bd (patch) | |
| tree | 5015ae4e2d574a704ea656de564568519d77e063 /libavcodec/mpeg4_unpack_bframes_bsf.c | |
| parent | 6090ac1d043c28937761ab0b0381088e900fa617 (diff) | |
| download | ffmpeg-fee1bffbc26ea6c39e11db0c58f3df9dd8fa84bd.tar.gz | |
mpeg4_unpack_bframes: Merge close and flush
They are identical now.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpeg4_unpack_bframes_bsf.c')
| -rw-r--r-- | libavcodec/mpeg4_unpack_bframes_bsf.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libavcodec/mpeg4_unpack_bframes_bsf.c b/libavcodec/mpeg4_unpack_bframes_bsf.c index 382070b423..1500d2135d 100644 --- a/libavcodec/mpeg4_unpack_bframes_bsf.c +++ b/libavcodec/mpeg4_unpack_bframes_bsf.c @@ -145,13 +145,7 @@ static int mpeg4_unpack_bframes_init(AVBSFContext *ctx) return 0; } -static void mpeg4_unpack_bframes_flush(AVBSFContext *bsfc) -{ - UnpackBFramesBSFContext *ctx = bsfc->priv_data; - av_buffer_unref(&ctx->b_frame_ref); -} - -static void mpeg4_unpack_bframes_close(AVBSFContext *bsfc) +static void mpeg4_unpack_bframes_close_flush(AVBSFContext *bsfc) { UnpackBFramesBSFContext *ctx = bsfc->priv_data; av_buffer_unref(&ctx->b_frame_ref); @@ -166,7 +160,7 @@ const AVBitStreamFilter ff_mpeg4_unpack_bframes_bsf = { .priv_data_size = sizeof(UnpackBFramesBSFContext), .init = mpeg4_unpack_bframes_init, .filter = mpeg4_unpack_bframes_filter, - .flush = mpeg4_unpack_bframes_flush, - .close = mpeg4_unpack_bframes_close, + .flush = mpeg4_unpack_bframes_close_flush, + .close = mpeg4_unpack_bframes_close_flush, .codec_ids = codec_ids, }; |