From d9022d38fb73af006f02ccb1db113cbabce83991 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 25 Jul 2008 23:49:01 +0000
Subject: [PATCH] Remove another 2 incorrect checks. These would ignore fields
of different parity.
Originally committed as revision 14404 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/h264.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c3def672ea8..ac0d088e4a1 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;
--
GitLab