[SCM] libav/experimental: Fix aspect ratio. fixes issue404 avienc.c change by StevieS

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:17:48 UTC 2013


The following commit has been merged in the experimental branch:
commit 61559562f52f9cfaf050500342c5bbba9ece3ce9
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Mar 27 01:18:16 2008 +0000

    Fix aspect ratio.
    fixes issue404
    avienc.c change by StevieS
    
    Originally committed as revision 12601 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index fdd796c..e338ddb 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -538,8 +538,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
                 get_le32(pb);
                 get_le32(pb);
 
-                active_aspect.num= get_le16(pb);
                 active_aspect.den= get_le16(pb);
+                active_aspect.num= get_le16(pb);
                 active.num       = get_le32(pb);
                 active.den       = get_le32(pb);
                 get_le32(pb); //nbFieldsPerFrame
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 6e8901e..35fee28 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -297,8 +297,8 @@ static int avi_write_header(AVFormatContext *s)
             put_le32(pb, lrintf(1.0/av_q2d(stream->time_base)));
             put_le32(pb, stream->width );
             put_le32(pb, stream->height);
-            put_le16(pb, num);
             put_le16(pb, den);
+            put_le16(pb, num);
             put_le32(pb, stream->width );
             put_le32(pb, stream->height);
             put_le32(pb, 1); //progressive FIXME

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list