Skip to content

F
ffmpeg
Commit 5b6213ef authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Sean McGovern
Browse files
Options

avcodec/vc1dec: fix mby_start for interlaced content 

Bug-Id: 1100
Bug-Id: ffmpeg/Ticket2531
Cc: libav-stable@libav.org
parent 9b09792c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/vc1dec.c
View file @ 5b6213ef
...@@ -652,7 +652,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, ...@@ -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, ...@@ -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++;
} }
......
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