Skip to content

F
ffmpeg
Commit e21307a2 authored by Rafaël Carré's avatar Rafaël Carré Committed by Anton Khirnov
Browse files
Options

lavf: don't abort if both encoder and muxer aspect ratios are not set 

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent c3e58f8f
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 7 deletions
libavformat/mux.c
View file @ e21307a2
...@@ -187,13 +187,18 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) ...@@ -187,13 +187,18 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
if (av_cmp_q(st->sample_aspect_ratio, if (av_cmp_q(st->sample_aspect_ratio,
codec->sample_aspect_ratio)) { codec->sample_aspect_ratio)) {
av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between muxer " if (st->sample_aspect_ratio.num != 0 &&
"(%d/%d) and encoder layer (%d/%d)\n", st->sample_aspect_ratio.den != 0 &&
st->sample_aspect_ratio.num, st->sample_aspect_ratio.den, codec->sample_aspect_ratio.den != 0 &&
codec->sample_aspect_ratio.num, codec->sample_aspect_ratio.den != 0) {
codec->sample_aspect_ratio.den); av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between muxer "
ret = AVERROR(EINVAL); "(%d/%d) and encoder layer (%d/%d)\n",
goto fail; st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,
codec->sample_aspect_ratio.num,
codec->sample_aspect_ratio.den);
ret = AVERROR(EINVAL);
goto fail;
}
} }
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment