RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 fe439c2069.
This commit is contained in:
Michael Niedermayer 2015-01-20 02:51:33 +01:00
parent 7873f9aa72
commit ff5b9a1cbe
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264.c
View File

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