RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-14 11:21:29 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/vc1dec: fix mby_start for interlaced content

Browse Source 
Bug-Id: 1100
Bug-Id: ffmpeg/Ticket2531
Cc: libav-stable@libav.org
This commit is contained in:
Michael Niedermayer 2013-12-14 17:11:21 +01:00 committed by Sean McGovern
parent 9b09792c90
commit 5b6213ef6b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vc1dec.c
View File

@ -652,7 +652,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;
@ -700,7 +700,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++;
} }