From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Sat, 27 Jan 2007 06:57:11 +0000 (+0000)
Subject: Set aspect ratio if present (for AP only)
X-Git-Tag: v0.5~10340
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74fd63d009cbf60a5fdfa6a0724508b87dd42347;p=platform%2Fupstream%2Flibav.git

Set aspect ratio if present (for AP only)

Originally committed as revision 7720 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index f08c964..40b79b3 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1296,12 +1296,14 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
         w = 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);
-        //TODO: store aspect ratio in AVCodecContext
         if(get_bits1(gb))
             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);
             h = get_bits(gb, 8);
+            v->s.avctx->sample_aspect_ratio = (AVRational){w, h};
         }
 
         if(get_bits1(gb)){ //framerate stuff