virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity

Merge commit '17a63ff0cd187b9e50e4a47862750295976853b1'

Browse Source 
* commit '17a63ff0cd187b9e50e4a47862750295976853b1':
  h264: update flag name in ff_h264_decode_ref_pic_list_reordering()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-01 04:55:41 +01:00
commit 153b870d1e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/h264_refs.c
View File

@ -225,16 +225,16 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
for (i = 0; i < h->ref_count[list]; i++) for (i = 0; i < h->ref_count[list]; i++)
COPY_PICTURE(&h->ref_list[list][i], &h->default_ref_list[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; int pred = h->curr_pic_num;
for (index = 0; ; index++) { 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; unsigned int pic_id;
int i; int i;
Picture *ref = NULL; Picture *ref = NULL;
if (reordering_of_pic_nums_idc == 3) if (modification_of_pic_nums_idc == 3)
break; break;
if (index >= h->ref_count[list]) { if (index >= h->ref_count[list]) {
@ -242,7 +242,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
return -1; return -1;
} }
switch (reordering_of_pic_nums_idc) { switch (modification_of_pic_nums_idc) {
case 0: case 0:
case 1: { case 1: {
const unsigned int abs_diff_pic_num = get_ue_golomb(&h->gb) + 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; return AVERROR_INVALIDDATA;
} }
if (reordering_of_pic_nums_idc == 0) if (modification_of_pic_nums_idc == 0)
pred -= abs_diff_pic_num; pred -= abs_diff_pic_num;
else else
pred += abs_diff_pic_num; pred += abs_diff_pic_num;
@ -298,7 +298,8 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h)
} }
default: default:
av_log(h->avctx, AV_LOG_ERROR, 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; return AVERROR_INVALIDDATA;
} }