diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-05-09 14:25:56 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-06-12 20:27:53 +0200 |
| commit | bec993381cfec72051b0d9f12ac9d9bb9c750983 (patch) | |
| tree | 4f7585caa0abcc3dcede2b8a7320b772094db291 /libavcodec/h264_picture.c | |
| parent | 2d410ebbaa1e760d6837cb434a6d1d4c3c6f0d85 (diff) | |
| download | ffmpeg-bec993381cfec72051b0d9f12ac9d9bb9c750983.tar.gz | |
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().
Diffstat (limited to 'libavcodec/h264_picture.c')
| -rw-r--r-- | libavcodec/h264_picture.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |