# HG changeset patch # User michael # Date 1217030131 0 # Node ID dfe1d1d104ebe74a5adfd865c2e1a37cfe1fbf8d # Parent f76bbe133ddd1c06a30b1f9d6278cdbe69b1e655 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. diff -r f76bbe133ddd -r dfe1d1d104eb h264.c --- a/h264.c Fri Jul 25 23:49:01 2008 +0000 +++ b/h264.c Fri Jul 25 23:55:31 2008 +0000 @@ -2954,7 +2954,8 @@ 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 @@ } 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;