diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 12:51:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 12:59:40 +0100 |
| commit | f62dfed3de400fa02f770ea8a0b750fc297336bf (patch) | |
| tree | 774fa7449b4baa126e7a6a4577164151f3ab7a2b /libavcodec/h264.c | |
| parent | 78265fcfeee153e5e26ad4dbc7831a84ade447d6 (diff) | |
| download | ffmpeg-f62dfed3de400fa02f770ea8a0b750fc297336bf.tar.gz | |
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>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e317319d72..d93053a603 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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; |