From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 25 Jul 2008 12:23:41 +0000 (+0000)
Subject: Remove another of these obfuscated special cases for field pictures
X-Git-Tag: v0.5~3509
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c29e05e60de644c92a00c80ac4afa873b2ef0052;p=platform%2Fupstream%2Flibav.git

Remove another of these obfuscated special cases for field pictures
that does not do anything.

Originally committed as revision 14388 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2620300..f59d0b9 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3551,9 +3551,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
         }
     }
 
-    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 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
                                              "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);