Commit 545ec935 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 05423d3a
...@@ -2946,11 +2946,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -2946,11 +2946,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
s0->first_field = FIELD_PICTURE; s0->first_field = FIELD_PICTURE;
} else { } else {
if (h->nal_ref_idc && if (s0->current_picture_ptr->frame_num != h->frame_num) {
s0->current_picture_ptr->f.reference &&
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 * different frame_nums. Consider this field first in
* pair. Throw away previous field except for reference * pair. Throw away previous field except for reference
* purposes. * purposes.
......
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