Mercurial > libavcodec.hg

comparison vc1.c @ 8584:8a47574d9fbc libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
VC-1 display dimensions should affect coded dimensions only (I think)
author kostya
date Tue, 13 Jan 2009 08:05:40 +0000
parents d94775e24b0e
children 8f9f86b93f88
comparison
equal deleted inserted replaced
8583:d94775e24b0e 8584:8a47574d9fbc
1005 } 1005 }
1006 v->s.max_b_frames = v->s.avctx->max_b_frames = 7; 1006 v->s.max_b_frames = v->s.avctx->max_b_frames = 7;
1007 if(get_bits1(gb)) { //Display Info - decoding is not affected by it 1007 if(get_bits1(gb)) { //Display Info - decoding is not affected by it
1008 int w, h, ar = 0; 1008 int w, h, ar = 0;
1009 av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n"); 1009 av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n");
1010 v->s.avctx->width = v->s.width = w = get_bits(gb, 14) + 1; 1010 v->s.avctx->coded_width = w = get_bits(gb, 14) + 1;
1011 v->s.avctx->height = v->s.height = h = get_bits(gb, 14) + 1; 1011 v->s.avctx->coded_height = h = get_bits(gb, 14) + 1;
1012 av_log(v->s.avctx, AV_LOG_DEBUG, "Display dimensions: %ix%i\n", w, h); 1012 av_log(v->s.avctx, AV_LOG_DEBUG, "Display dimensions: %ix%i\n", w, h);
1013 if(get_bits1(gb)) 1013 if(get_bits1(gb))
1014 ar = get_bits(gb, 4); 1014 ar = get_bits(gb, 4);
1015 if(ar && ar < 14){ 1015 if(ar && ar < 14){
1016 v->s.avctx->sample_aspect_ratio = ff_vc1_pixel_aspect[ar]; 1016 v->s.avctx->sample_aspect_ratio = ff_vc1_pixel_aspect[ar];