Browse Source

h264: simplify frame_recovered code

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
f62dfed3de
1 changed files with 0 additions and 6 deletions
  1. +0
    -6
      libavcodec/h264.c

+ 0
- 6
libavcodec/h264.c View File

@@ -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:


/* 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;




Loading…
Cancel
Save