Mercurial > libavcodec.hg

changeset 7389:8ef2e8f077ff libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove another of these obfuscated special cases for field pictures that does not do anything.
author michael
date Fri, 25 Jul 2008 12:23:41 +0000
parents d2d876733e9e
children 7abedf6425d8
files h264.c
diffstat 1 files changed, 1 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Fri Jul 25 12:12:25 2008 +0000
+++ b/h264.c	Fri Jul 25 12:23:41 2008 +0000
@@ -3551,9 +3551,7 @@
         }
     }
 
-    if (!current_ref_assigned && FIELD_PICTURE &&
-            !s->first_field && s->current_picture_ptr->reference) {
-
+    if (!current_ref_assigned) {
         /* Second field of complementary field pair; the first field of
          * which is already referenced. If short referenced, it
          * should be first entry in short_ref. If not, it must exist
@@ -3569,17 +3567,6 @@
                                              "in complementary field pair "
                                              "(first field is long term)\n");
         } else {
-            /*
-             * First field in reference, but not in any sensible place on our
-             * reference lists. This shouldn't happen unless reference
-             * handling somewhere else is wrong.
-             */
-            assert(0);
-        }
-        current_ref_assigned = 1;
-    }
-
-    if(!current_ref_assigned){
         pic= remove_short(h, s->current_picture_ptr->frame_num);
         if(pic){
             unreference_pic(h, pic, 0);