From 61559562f52f9cfaf050500342c5bbba9ece3ce9 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 27 Mar 2008 01:18:16 +0000
Subject: [PATCH] Fix aspect ratio. fixes issue404 avienc.c change by StevieS
Originally committed as revision 12601 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/avidec.c | 2 +-
libavformat/avienc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index fdd796c55a7..e338ddbb7cb 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 6e8901ea8e8..35fee28ed48 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
--
GitLab