mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Set aspect ratio if present (for AP only)
Originally committed as revision 7720 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
edab3048c2
commit
74fd63d009
@ -1296,12 +1296,14 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
|
|||||||
w = get_bits(gb, 14) + 1;
|
w = get_bits(gb, 14) + 1;
|
||||||
h = get_bits(gb, 14) + 1;
|
h = get_bits(gb, 14) + 1;
|
||||||
av_log(v->s.avctx, AV_LOG_INFO, "Display dimensions: %ix%i\n", w, h);
|
av_log(v->s.avctx, AV_LOG_INFO, "Display dimensions: %ix%i\n", w, h);
|
||||||
//TODO: store aspect ratio in AVCodecContext
|
|
||||||
if(get_bits1(gb))
|
if(get_bits1(gb))
|
||||||
ar = get_bits(gb, 4);
|
ar = get_bits(gb, 4);
|
||||||
if(ar == 15) {
|
if(ar && ar < 14){
|
||||||
|
v->s.avctx->sample_aspect_ratio = vc1_pixel_aspect[ar];
|
||||||
|
}else if(ar == 15){
|
||||||
w = get_bits(gb, 8);
|
w = get_bits(gb, 8);
|
||||||
h = get_bits(gb, 8);
|
h = get_bits(gb, 8);
|
||||||
|
v->s.avctx->sample_aspect_ratio = (AVRational){w, h};
|
||||||
}
|
}
|
||||||
|
|
||||||
if(get_bits1(gb)){ //framerate stuff
|
if(get_bits1(gb)){ //framerate stuff
|
||||||
|
Loading…
Reference in New Issue
Block a user