Commit f62dfed3 authored by Michael Niedermayer's avatar Michael Niedermayer

h264: simplify frame_recovered code

This is a separate commit to ease future bisecting in case it breaks something.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 78265fcf
...@@ -2197,9 +2197,7 @@ static void decode_postinit(H264Context *h, int setup_finished) ...@@ -2197,9 +2197,7 @@ static void decode_postinit(H264Context *h, int setup_finished)
// display order are "recovered". // display order are "recovered".
h->frame_recovered |= FRAME_RECOVERED_SEI; h->frame_recovered |= FRAME_RECOVERED_SEI;
} }
#if 0
h->next_output_pic->recovered |= !!(h->frame_recovered & FRAME_RECOVERED_SEI); h->next_output_pic->recovered |= !!(h->frame_recovered & FRAME_RECOVERED_SEI);
#endif
} }
if (setup_finished && !h->avctx->hwaccel) if (setup_finished && !h->avctx->hwaccel)
...@@ -5152,12 +5150,8 @@ not_extra: ...@@ -5152,12 +5150,8 @@ not_extra:
/* Wait for second field. */ /* Wait for second field. */
*got_frame = 0; *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 && ( if (h->next_output_pic && (
h->next_output_pic->recovered)) { h->next_output_pic->recovered)) {
#endif
if (!h->next_output_pic->recovered) if (!h->next_output_pic->recovered)
h->next_output_pic->f.flags |= AV_FRAME_FLAG_CORRUPT; h->next_output_pic->f.flags |= AV_FRAME_FLAG_CORRUPT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment