[FFmpeg-cvslog] avcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL is set

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 22 21:17:49 2014 +0100| [fe439c20698fc4992b9373cb068efb438fe1a098] | committer: Michael Niedermayer

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

This allows viewing more of ticket2254

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe439c20698fc4992b9373cb068efb438fe1a098
---

 libavcodec/h264.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index e507308..f40449e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -762,7 +762,10 @@ 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);
-        return;
+        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;
     }
 
     cur->f.interlaced_frame = 0;