diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-05-09 09:30:10 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-06-12 20:27:53 +0200 |
| commit | 39ab2ea53121b9976a619cd545fbd3464b908696 (patch) | |
| tree | c7c7b1266c5bbfb2521e8059d5fecd9762c919e0 /libavcodec/h264_slice.c | |
| parent | 7ab5d577a9affe3397c08b032f983f9bf7101865 (diff) | |
| download | ffmpeg-streaming-39ab2ea53121b9976a619cd545fbd3464b908696.zip ffmpeg-streaming-39ab2ea53121b9976a619cd545fbd3464b908696.tar.gz | |
h264: rename mmco_index to nb_mmco
The variable stores the number of mmco entries, so the current name is
misleading.
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 5cb5844..634f181 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -416,7 +416,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->next_outputed_poc = h1->next_outputed_poc; memcpy(h->mmco, h1->mmco, sizeof(h->mmco)); - h->mmco_index = h1->mmco_index; + h->nb_mmco = h1->nb_mmco; h->mmco_reset = h1->mmco_reset; h->long_ref_count = h1->long_ref_count; h->short_ref_count = h1->short_ref_count; @@ -430,7 +430,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, return 0; 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; } @@ -1204,7 +1204,7 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) ret = ff_generate_sliding_window_mmcos(h, 1); if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) return ret; - ret = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index); + ret = ff_h264_execute_ref_pic_marking(h, h->mmco, h->nb_mmco); if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) return ret; /* Error concealment: If a ref is missing, copy the previous ref @@ -1343,7 +1343,7 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl) sl->slice_type_nos, &sl->pwt); // If frame-mt is enabled, only update mmco tables for the first slice - // in a field. Subsequent slices can temporarily clobber h->mmco_index + // in a field. Subsequent slices can temporarily clobber h->nb_mmco // or h->mmco, which will cause ref list mix-ups and decoding errors // further down the line. This may break decoding if the first slice is // corrupt, thus we only do this if frame-mt is enabled. |
