diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-12 21:10:15 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-12-06 23:39:42 +0100 |
| commit | ba5bb0562b37313540845ae7fa069134aad6e0c9 (patch) | |
| tree | 74256ea8ddf75e5372033c3f5bfbf1bd0790119b | |
| parent | 47b5fabd6a4227cb4e978fa8a19ef43d4d9bbec0 (diff) | |
| download | ffmpeg-ba5bb0562b37313540845ae7fa069134aad6e0c9.tar.gz | |
h264: Use mismatching frame numbers in fields
to synchronize the first/second field state independant of them being reference or not.
Fixes Ticket354
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 545ec935a4b4e0f032ebd975907b41f6fe4465c9)
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ff38bd7db7..27833f554a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2810,11 +2810,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ s0->first_field = FIELD_PICTURE; } else { - if (h->nal_ref_idc && - s0->current_picture_ptr->reference && - s0->current_picture_ptr->frame_num != h->frame_num) { + if (s0->current_picture_ptr->frame_num != h->frame_num) { /* - * This and previous field were reference, but had + * This and previous field had * different frame_nums. Consider this field first in * pair. Throw away previous field except for reference * purposes. |