1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

avcodec/vc1dec: fix mby_start for interlaced content

Fixes first frame of Ticket2531

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-14 17:11:21 +01:00
parent 017e234c20
commit c9f72e4b81

View File

@ -5858,7 +5858,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
buf_size3 << 3); buf_size3 << 3);
/* assuming that the field marker is at the exact middle, /* assuming that the field marker is at the exact middle,
hope it's correct */ hope it's correct */
slices[n_slices].mby_start = s->mb_height >> 1; slices[n_slices].mby_start = s->mb_height + 1 >> 1;
n_slices1 = n_slices - 1; // index of the last slice of the first field n_slices1 = n_slices - 1; // index of the last slice of the first field
n_slices++; n_slices++;
break; break;
@ -5909,7 +5909,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
buf_size3 = vc1_unescape_buffer(divider + 4, buf + buf_size - divider - 4, slices[n_slices].buf); buf_size3 = vc1_unescape_buffer(divider + 4, buf + buf_size - divider - 4, slices[n_slices].buf);
init_get_bits(&slices[n_slices].gb, slices[n_slices].buf, init_get_bits(&slices[n_slices].gb, slices[n_slices].buf,
buf_size3 << 3); buf_size3 << 3);
slices[n_slices].mby_start = s->mb_height >> 1; slices[n_slices].mby_start = s->mb_height + 1 >> 1;
n_slices1 = n_slices - 1; n_slices1 = n_slices - 1;
n_slices++; n_slices++;
} }