From bec993381cfec72051b0d9f12ac9d9bb9c750983 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 9 May 2016 14:25:56 +0200 Subject: h264: postpone generating the implicit MMCOs Do it right before the MMCOs are applied to the DPB. This will allow moving the frame_start() call out of the slice header parsing, since generating the implicit MMCOs needs to be done after frame_start(). --- libavcodec/h264_picture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/h264_picture.c') diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index b16e3c09ae..cd7ff82d71 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -154,7 +154,7 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) if (in_setup || !(avctx->active_thread_type & FF_THREAD_FRAME)) { if (!h->droppable) { - err = ff_h264_execute_ref_pic_marking(h, h->mmco, h->nb_mmco); + err = ff_h264_execute_ref_pic_marking(h); h->poc.prev_poc_msb = h->poc.poc_msb; h->poc.prev_poc_lsb = h->poc.poc_lsb; } -- cgit v1.2.3