Commit 0bc42cad authored by Loren Merritt's avatar Loren Merritt Committed by Michael Niedermayer

h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)

Originally committed as revision 3558 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 78a0efb4
...@@ -2592,6 +2592,8 @@ static int decode_ref_pic_list_reordering(H264Context *h){ ...@@ -2592,6 +2592,8 @@ static int decode_ref_pic_list_reordering(H264Context *h){
int pic_id; int pic_id;
int i; int i;
if(reordering_of_pic_nums_idc==3)
break;
if(index >= h->ref_count[list]){ if(index >= h->ref_count[list]){
av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
...@@ -2634,9 +2636,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){ ...@@ -2634,9 +2636,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){
} }
h->ref_list[list][index]= tmp; h->ref_list[list][index]= tmp;
} }
}else if(reordering_of_pic_nums_idc==3) }else{
break;
else{
av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment