diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-22 21:17:49 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-22 21:42:36 +0100 |
commit | fe439c20698fc4992b9373cb068efb438fe1a098 (patch) | |
tree | 6a9fb8ad0905fcc80939dceed1e613662ed73259 | |
parent | 75cc85b23970b1238d6e3107ac817120e42a6686 (diff) |
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@gmx.at>
-rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e5073089d9..f40449eb0a 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; |