diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-29 20:07:52 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-29 20:07:52 +0200 |
| commit | 57d30fde9ea847cf4bff70a1419facad905e72a4 (patch) | |
| tree | 301746a8c61f6e8aa4c3b70eb1391b0ca180d48e /libavcodec/h264_picture.c | |
| parent | c28aecc56ace7a6f5f21c1484d00932d4777f4e8 (diff) | |
| parent | 39ab2ea53121b9976a619cd545fbd3464b908696 (diff) | |
Merge commit '39ab2ea53121b9976a619cd545fbd3464b908696'
* commit '39ab2ea53121b9976a619cd545fbd3464b908696':
h264: rename mmco_index to nb_mmco
Merged-by: Clément Bœsch <u@pkh.me>
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 7e2adda48f..320bb0cbbb 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->mmco_index); + err = ff_h264_execute_ref_pic_marking(h, h->mmco, h->nb_mmco); h->poc.prev_poc_msb = h->poc.poc_msb; h->poc.prev_poc_lsb = h->poc.poc_lsb; } |