Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5'

[ffmpeg] / ffmpeg.c

diff --git a/ffmpeg.c b/ffmpeg.c
index ea41645191bd2058f0aad7cb863bbba967981a44..30b69d3aed0452bc7e73000993d773812ef015e1 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2224,7 +2224,14 @@ static int transcode_init(void)
                 codec->width              = icodec->width;
                 codec->height             = icodec->height;
                 codec->has_b_frames       = icodec->has_b_frames;
-                if (!codec->sample_aspect_ratio.num) {
+                if (ost->frame_aspect_ratio.num) { // overridden by the -aspect cli option
+                    codec->sample_aspect_ratio   =
+                    ost->st->sample_aspect_ratio =
+                        av_mul_q(ost->frame_aspect_ratio,
+                                 (AVRational){ codec->height, codec->width });
+                    av_log(NULL, AV_LOG_WARNING, "Overriding aspect ratio "
+                           "with stream copy may produce invalid files\n");
+                } else if (!codec->sample_aspect_ratio.num) {
                     codec->sample_aspect_ratio   =
                     ost->st->sample_aspect_ratio =
                         ist->st->sample_aspect_ratio.num ? ist->st->sample_aspect_ratio :