From ff5b9a1cbe9669249f2b8143678d2cf27504fca7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 20 Jan 2015 02:51:33 +0100 Subject: [PATCH] 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. --- libavcodec/h264.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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;