OSDN Git Service

Revert "avcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL...
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Jan 2015 01:51:33 +0000 (02:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Jan 2015 01:51:33 +0000 (02:51 +0100)
Fixes regression
Fixes Ticket4274

Suggested-by: kierank
This reverts commit fe439c20698fc4992b9373cb068efb438fe1a098.

libavcodec/h264.c

index b27e747..ab9acde 100644 (file)
@@ -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;