Message ID | 20200313102850.23913-15-anton@khirnov.net |
---|---|
State | Accepted |
Headers | show |
Series | [FFmpeg-devel,01/18] mpeg4videodec: do not copy a range of fields at once | expand |
Context | Check | Description |
---|---|---|
andriy/ffmpeg-patchwork | warning | Failed to apply patch |
On Fri, Mar 13, 2020 at 11:28:47AM +0100, Anton Khirnov wrote: > The name is misleading, this function does a lot more than just flushing > the DPB. > --- > libavcodec/h264dec.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) not tested (as a earlier patch didnt apply automatically) but LGTM thx [...]
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 79663d8083..a119fa7641 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -488,8 +488,7 @@ void ff_h264_flush_change(H264Context *h) h->mmco_reset = 1; } -/* forget old pics after a seek */ -static void flush_dpb(AVCodecContext *avctx) +static void h264_decode_flush(AVCodecContext *avctx) { H264Context *h = avctx->priv_data; int i; @@ -1068,7 +1067,7 @@ AVCodec ff_h264_decoder = { }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_ALLOCATE_PROGRESS, - .flush = flush_dpb, + .flush = h264_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_h264_update_thread_context), .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles), .priv_class = &h264_class,