diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 04:55:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 05:02:58 +0100 |
| commit | 153b870d1e681f7bdbfcda7c8c4d6c2c347e5fd9 (patch) | |
| tree | 557c0885acd710f93443c9020cb4ec2ce0589dd7 /libavcodec | |
| parent | 983c7f4015baee2e5565c5702dd76dc4c8620aa7 (diff) | |
| parent | 17a63ff0cd187b9e50e4a47862750295976853b1 (diff) | |
| download | ffmpeg-streaming-153b870d1e681f7bdbfcda7c8c4d6c2c347e5fd9.zip ffmpeg-streaming-153b870d1e681f7bdbfcda7c8c4d6c2c347e5fd9.tar.gz | |
Merge commit '17a63ff0cd187b9e50e4a47862750295976853b1'
* commit '17a63ff0cd187b9e50e4a47862750295976853b1':
h264: update flag name in ff_h264_decode_ref_pic_list_reordering()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_refs.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 253cd85..9586544 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -225,16 +225,16 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h) for (i = 0; i < h->ref_count[list]; i++) COPY_PICTURE(&h->ref_list[list][i], &h->default_ref_list[list][i]); - if (get_bits1(&h->gb)) { + if (get_bits1(&h->gb)) { // ref_pic_list_modification_flag_l[01] int pred = h->curr_pic_num; for (index = 0; ; index++) { - unsigned int reordering_of_pic_nums_idc = get_ue_golomb_31(&h->gb); + unsigned int modification_of_pic_nums_idc = get_ue_golomb_31(&h->gb); unsigned int pic_id; int i; Picture *ref = NULL; - if (reordering_of_pic_nums_idc == 3) + if (modification_of_pic_nums_idc == 3) break; if (index >= h->ref_count[list]) { @@ -242,7 +242,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h) return -1; } - switch (reordering_of_pic_nums_idc) { + switch (modification_of_pic_nums_idc) { case 0: case 1: { const unsigned int abs_diff_pic_num = get_ue_golomb(&h->gb) + 1; @@ -254,7 +254,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h) return AVERROR_INVALIDDATA; } - if (reordering_of_pic_nums_idc == 0) + if (modification_of_pic_nums_idc == 0) pred -= abs_diff_pic_num; else pred += abs_diff_pic_num; @@ -298,7 +298,8 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h) } default: av_log(h->avctx, AV_LOG_ERROR, - "illegal reordering_of_pic_nums_idc\n"); + "illegal modification_of_pic_nums_idc %u\n", + modification_of_pic_nums_idc); return AVERROR_INVALIDDATA; } |
