diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-30 10:24:03 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-30 10:24:03 +0200 |
| commit | f48aea66ddfef3998ee7aaf6c6567577ae481807 (patch) | |
| tree | 5326d8495af308729efe2850f33ca3cbe50b83a2 /libavcodec/h264_picture.c | |
| parent | d407e76c42d5ae79791ff88d3bd5185e10ad6047 (diff) | |
| parent | bec993381cfec72051b0d9f12ac9d9bb9c750983 (diff) | |
Merge commit 'bec993381cfec72051b0d9f12ac9d9bb9c750983'
* commit 'bec993381cfec72051b0d9f12ac9d9bb9c750983':
h264: postpone generating the implicit MMCOs
Merged-by: Clément Bœsch <clement@stupeflix.com>
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 320bb0cbbb..6426b54ab3 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -164,7 +164,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; } |