diff options
| author | Marton Balint <cus@passwd.hu> | 2012-05-20 15:53:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 19:36:00 +0200 |
| commit | b36a0a80fca1afe164ab97252d9f7f410869eff0 (patch) | |
| tree | efef3627d462055cc8a9139359ffba0b7231b8ba | |
| parent | 4a5d18b6e264779c4d3629f6b724c5ca44c41b03 (diff) | |
| download | ffmpeg-b36a0a80fca1afe164ab97252d9f7f410869eff0.tar.gz | |
lavf: also use codec aspect ratio in av_guess_sample_aspect_ratio
Use codec aspect ratio for frame aspect ratio if AVFrame is NULL.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 3 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index c2a5931350..2d3ec0fb92 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4420,7 +4420,8 @@ AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *strea { AVRational undef = {0, 1}; AVRational stream_sample_aspect_ratio = stream ? stream->sample_aspect_ratio : undef; - AVRational frame_sample_aspect_ratio = frame ? frame->sample_aspect_ratio : undef; + AVRational codec_sample_aspect_ratio = stream && stream->codec ? stream->codec->sample_aspect_ratio : undef; + AVRational frame_sample_aspect_ratio = frame ? frame->sample_aspect_ratio : codec_sample_aspect_ratio; av_reduce(&stream_sample_aspect_ratio.num, &stream_sample_aspect_ratio.den, stream_sample_aspect_ratio.num, stream_sample_aspect_ratio.den, INT_MAX); diff --git a/libavformat/version.h b/libavformat/version.h index 17f8b161c1..afc235c43c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 5 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |