Commit 7614e100 authored by kostya's avatar kostya

Display dimensions should not affect the real size of coded frame, thus set

only avctx->{width,height} and don't touch coded_{width,height} when parsing
them. This fixes the case when coded and display dimensions differ by more
than one macroblock.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18665 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 19a4139d
......@@ -975,8 +975,8 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
if(get_bits1(gb)) { //Display Info - decoding is not affected by it
int w, h, ar = 0;
av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n");
v->s.avctx->coded_width = w = get_bits(gb, 14) + 1;
v->s.avctx->coded_height = h = get_bits(gb, 14) + 1;
v->s.avctx->width = w = get_bits(gb, 14) + 1;
v->s.avctx->height = h = get_bits(gb, 14) + 1;
av_log(v->s.avctx, AV_LOG_DEBUG, "Display dimensions: %ix%i\n", w, h);
if(get_bits1(gb))
ar = get_bits(gb, 4);
......
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