Mercurial > libavcodec.hg

changeset 7405:dfe1d1d104eb libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author michael
date Fri, 25 Jul 2008 23:55:31 +0000
parents f76bbe133ddd
children 7b2819083061
files h264.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;