har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpeg4_unpack_bframes: Merge close and flush

Browse Source 
They are identical now.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Andreas Rheinhardt 2019-07-10 23:08:27 +02:00 committed by Michael Niedermayer
parent 6090ac1d04
commit fee1bffbc2
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mpeg4_unpack_bframes_bsf.c
View File

@ -145,13 +145,7 @@ static int mpeg4_unpack_bframes_init(AVBSFContext *ctx)
return 0; return 0;
} }
static void mpeg4_unpack_bframes_flush(AVBSFContext *bsfc) static void mpeg4_unpack_bframes_close_flush(AVBSFContext *bsfc)
{
UnpackBFramesBSFContext *ctx = bsfc->priv_data;
av_buffer_unref(&ctx->b_frame_ref);
}
static void mpeg4_unpack_bframes_close(AVBSFContext *bsfc)
{ {
UnpackBFramesBSFContext *ctx = bsfc->priv_data; UnpackBFramesBSFContext *ctx = bsfc->priv_data;
av_buffer_unref(&ctx->b_frame_ref); av_buffer_unref(&ctx->b_frame_ref);
@ -166,7 +160,7 @@ const AVBitStreamFilter ff_mpeg4_unpack_bframes_bsf = {
.priv_data_size = sizeof(UnpackBFramesBSFContext), .priv_data_size = sizeof(UnpackBFramesBSFContext),
.init = mpeg4_unpack_bframes_init, .init = mpeg4_unpack_bframes_init,
.filter = mpeg4_unpack_bframes_filter, .filter = mpeg4_unpack_bframes_filter,
.flush = mpeg4_unpack_bframes_flush, .flush = mpeg4_unpack_bframes_close_flush,
.close = mpeg4_unpack_bframes_close, .close = mpeg4_unpack_bframes_close_flush,
.codec_ids = codec_ids, .codec_ids = codec_ids,
}; };