mirror of https://git.ffmpeg.org/ffmpeg.git
asfdec: flip the interpretation of the header aspect back
This reverts 2de8877689
Fixes Ticket 1883
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
343c73e252
commit
e5927910c2
|
@ -785,12 +785,12 @@ static int asf_read_header(AVFormatContext *s)
|
||||||
if (!st->codec->bit_rate)
|
if (!st->codec->bit_rate)
|
||||||
st->codec->bit_rate = asf->stream_bitrates[i];
|
st->codec->bit_rate = asf->stream_bitrates[i];
|
||||||
if (asf->dar[i].num > 0 && asf->dar[i].den > 0){
|
if (asf->dar[i].num > 0 && asf->dar[i].den > 0){
|
||||||
av_reduce(&st->sample_aspect_ratio.den,
|
av_reduce(&st->sample_aspect_ratio.num,
|
||||||
&st->sample_aspect_ratio.num,
|
&st->sample_aspect_ratio.den,
|
||||||
asf->dar[i].num, asf->dar[i].den, INT_MAX);
|
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.
|
} 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,
|
av_reduce(&st->sample_aspect_ratio.num,
|
||||||
&st->sample_aspect_ratio.num,
|
&st->sample_aspect_ratio.den,
|
||||||
asf->dar[0].num, asf->dar[0].den, INT_MAX);
|
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",
|
av_dlog(s, "i=%d, st->codec->codec_type:%d, asf->dar %d:%d sar=%d:%d\n",
|
||||||
|
|
Loading…
Reference in New Issue