mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
parent
4a5d18b6e2
commit
b36a0a80fc
|
@ -4420,7 +4420,8 @@ AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *strea
|
||||||
{
|
{
|
||||||
AVRational undef = {0, 1};
|
AVRational undef = {0, 1};
|
||||||
AVRational stream_sample_aspect_ratio = stream ? stream->sample_aspect_ratio : undef;
|
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,
|
av_reduce(&stream_sample_aspect_ratio.num, &stream_sample_aspect_ratio.den,
|
||||||
stream_sample_aspect_ratio.num, stream_sample_aspect_ratio.den, INT_MAX);
|
stream_sample_aspect_ratio.num, stream_sample_aspect_ratio.den, INT_MAX);
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_MAJOR 54
|
#define LIBAVFORMAT_VERSION_MAJOR 54
|
||||||
#define LIBAVFORMAT_VERSION_MINOR 5
|
#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, \
|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||||
LIBAVFORMAT_VERSION_MINOR, \
|
LIBAVFORMAT_VERSION_MINOR, \
|
||||||
|
|
Loading…
Reference in New Issue