generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: simplify frame_recovered code

Browse Source 
This is a separate commit to ease future bisecting in case it breaks something.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-01 12:51:33 +01:00
parent 78265fcfee
commit f62dfed3de
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264.c
View File

@ -2197,9 +2197,7 @@ static void decode_postinit(H264Context *h, int setup_finished)
// display order are "recovered".
h->frame_recovered |= FRAME_RECOVERED_SEI;
}
#if 0
h->next_output_pic->recovered |= !!(h->frame_recovered & FRAME_RECOVERED_SEI);
#endif
}
if (setup_finished && !h->avctx->hwaccel)
@ -5152,12 +5150,8 @@ not_extra:
/* Wait for second field. */
*got_frame = 0;
#if 1
if (h->next_output_pic && (h->next_output_pic->recovered || h->frame_recovered>1)) {
#else
if (h->next_output_pic && (
h->next_output_pic->recovered)) {
#endif
if (!h->next_output_pic->recovered)
h->next_output_pic->f.flags |= AV_FRAME_FLAG_CORRUPT;