From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 20 Jan 2015 01:51:33 +0000 (+0100)
Subject: Revert "avcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL... 
X-Git-Tag: android-x86-6.0-r1~854
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ff5b9a1cbe9669249f2b8143678d2cf27504fca7;p=android-x86%2Fexternal-ffmpeg.git

Revert "avcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL is set"

Fixes regression
Fixes Ticket4274

Suggested-by: kierank

This reverts commit fe439c20698fc4992b9373cb068efb438fe1a098.
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b27e747d0b..ab9acde7cb 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -762,10 +762,7 @@ static void decode_postinit(H264Context *h, int setup_finished)
          * yet, so we assume the worst for now. */
         // if (setup_finished)
         //    ff_thread_finish_setup(h->avctx);
-        if (cur->field_poc[0] == INT_MAX && cur->field_poc[1] == INT_MAX)
-            return;
-        if (h->avctx->hwaccel || !(h->avctx->flags2 & CODEC_FLAG2_SHOW_ALL))
-            return;
+        return;
     }
 
     cur->f.interlaced_frame = 0;