diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-07-25 23:49:01 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-07-25 23:49:01 +0000 |
| commit | d9022d38fb73af006f02ccb1db113cbabce83991 (patch) | |
| tree | c0e36f20e55c2a0d4cc5ca9fb225eb14aa416ead /libavcodec/h264.c | |
| parent | 79b5c77692edafe7d979f3684561fbc87f4fb7f0 (diff) | |
Remove another 2 incorrect checks.
These would ignore fields of different parity.
Originally committed as revision 14404 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c3def672ea..ac0d088e4a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2954,8 +2954,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){ assert(ref->reference); assert(!ref->long_ref); if( - ref->frame_num == frame_num && - (ref->reference & pic_structure) + ref->frame_num == frame_num ) break; } @@ -2973,7 +2972,7 @@ static int decode_ref_pic_list_reordering(H264Context *h){ } ref = h->long_ref[long_idx]; assert(!(ref && !ref->reference)); - if(ref && (ref->reference & pic_structure)){ + if(ref){ ref->pic_id= pic_id; assert(ref->long_ref); i=0; |