OSDN Git Service

lavf/utils: only complain about aspect missmatch when the difference is "meassureable"
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Sep 2011 16:17:28 +0000 (18:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Sep 2011 16:19:00 +0000 (18:19 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c

index ee62000..0f367b7 100644 (file)
@@ -3012,7 +3012,9 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
                 ret = AVERROR(EINVAL);
                 goto fail;
             }
-            if(av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)){
+            if(av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)
+               && FFABS(av_q2d(st->sample_aspect_ratio) - av_q2d(st->codec->sample_aspect_ratio)) > 0.001
+            ){
                 av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between encoder and muxer layer\n");
                 ret = AVERROR(EINVAL);
                 goto fail;