diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 05:39:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 05:49:07 +0100 |
| commit | e5927910c2a156e9ad6388413400b620d1dcf035 (patch) | |
| tree | 79e730800477f03a5b0c69b393f8189c31ab162b /libavformat/asfdec.c | |
| parent | 343c73e252d3e3c1e5d2037c2e8eb14b504f1e6f (diff) | |
| download | ffmpeg-e5927910c2a156e9ad6388413400b620d1dcf035.tar.gz | |
asfdec: flip the interpretation of the header aspect back
This reverts 2de88776892093b10522152f1f72b7dfc0320502
Fixes Ticket 1883
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfdec.c')
| -rw-r--r-- | libavformat/asfdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 9339e1b351..535d5108c7 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -785,12 +785,12 @@ static int asf_read_header(AVFormatContext *s) if (!st->codec->bit_rate) st->codec->bit_rate = asf->stream_bitrates[i]; if (asf->dar[i].num > 0 && asf->dar[i].den > 0){ - av_reduce(&st->sample_aspect_ratio.den, - &st->sample_aspect_ratio.num, + av_reduce(&st->sample_aspect_ratio.num, + &st->sample_aspect_ratio.den, asf->dar[i].num, asf->dar[i].den, INT_MAX); } else if ((asf->dar[0].num > 0) && (asf->dar[0].den > 0) && (st->codec->codec_type==AVMEDIA_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set. - av_reduce(&st->sample_aspect_ratio.den, - &st->sample_aspect_ratio.num, + av_reduce(&st->sample_aspect_ratio.num, + &st->sample_aspect_ratio.den, asf->dar[0].num, asf->dar[0].den, INT_MAX); av_dlog(s, "i=%d, st->codec->codec_type:%d, asf->dar %d:%d sar=%d:%d\n", |