mirror of https://git.ffmpeg.org/ffmpeg.git
Revert r14404
Remove another 2 incorrect checks. These would ignore fields of different parity. I was wrong, i thought pic_stricture is the current pic structure. But it does not make a difference either way on the reference bitstreams. Originally committed as revision 14405 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
d9022d38fb
commit
af8c5e08d7
|
@ -2954,7 +2954,8 @@ static int decode_ref_pic_list_reordering(H264Context *h){
|
|||
assert(ref->reference);
|
||||
assert(!ref->long_ref);
|
||||
if(
|
||||
ref->frame_num == frame_num
|
||||
ref->frame_num == frame_num &&
|
||||
(ref->reference & pic_structure)
|
||||
)
|
||||
break;
|
||||
}
|
||||
|
@ -2972,7 +2973,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){
|
|||
}
|
||||
ref = h->long_ref[long_idx];
|
||||
assert(!(ref && !ref->reference));
|
||||
if(ref){
|
||||
if(ref && (ref->reference & pic_structure)){
|
||||
ref->pic_id= pic_id;
|
||||
assert(ref->long_ref);
|
||||
i=0;
|
||||
|
|
Loading…
Reference in New Issue