History

mpeg4_unpack_bframes: Merge close and flush

They are identical now.

Andreas Rheinhardt committed 7 years ago

Commit fee1bff1 parent 6090ac11 file · +3 −9Browse files

Unified · Split

libavcodec/mpeg4_unpack_bframes_bsf.c+3−9
@@ -145,13 +145,7 @@ static int mpeg4_unpack_bframes_init(AVBSFContext *ctx) · 144 unmodified lines
145145 return 0;
146146 }
147147
148−static void mpeg4_unpack_bframes_flush(AVBSFContext *bsfc)
149−{
150− UnpackBFramesBSFContext *ctx = bsfc->priv_data;
151− av_buffer_unref(&ctx->b_frame_ref);
152−}
153−
154−static void mpeg4_unpack_bframes_close(AVBSFContext *bsfc)
148+static void mpeg4_unpack_bframes_close_flush(AVBSFContext *bsfc)
155149 {
156150 UnpackBFramesBSFContext *ctx = bsfc->priv_data;
157151 av_buffer_unref(&ctx->b_frame_ref);
@@ -166,7 +160,7 @@ const AVBitStreamFilter ff_mpeg4_unpack_bframes_bsf = { · 8 unmodified lines
166160 .priv_data_size = sizeof(UnpackBFramesBSFContext),
167161 .init = mpeg4_unpack_bframes_init,
168162 .filter = mpeg4_unpack_bframes_filter,
169− .flush = mpeg4_unpack_bframes_flush,
170− .close = mpeg4_unpack_bframes_close,
163+ .flush = mpeg4_unpack_bframes_close_flush,
164+ .close = mpeg4_unpack_bframes_close_flush,
171165 .codec_ids = codec_ids,
172166 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t