[FFmpeg-devel] [PATCH] ffmpeg: make -aspect work with -vcodec copy.

[Nicolas George]

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 ffmpeg.c     |    8 +++++++-
 ffmpeg_opt.c |   26 +++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index effb042..06f0847 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2216,7 +2216,13 @@ 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) { // overridden by the -aspect cli option
+                    codec->sample_aspect_ratio   =
+                    ost->st->sample_aspect_ratio =
+                        av_d2q(ost->frame_aspect_ratio * codec->height / codec->width, 255);
+                    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 :
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 1f4d89e..219b6c0 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1169,7 +1169,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
     AVStream *st;
     OutputStream *ost;
     AVCodecContext *video_enc;
-    char *frame_rate = NULL;
+    char *frame_rate = NULL, *frame_aspect_ratio = NULL;
 
     ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO, source_index);
     st  = ost->st;
@@ -1181,10 +1181,21 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
         exit(1);
     }
 
+    MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st);
+    if (frame_aspect_ratio) {
+        AVRational q;
+        if (av_parse_ratio(&q, frame_aspect_ratio, 255, 0, NULL) < 0 ||
+            q.num <= 0 || q.den <= 0) {
+            av_log(NULL, AV_LOG_FATAL, "Invalid aspect ratio: %s\n", frame_aspect_ratio);
+            exit(1);
+        }
+        ost->frame_aspect_ratio = av_q2d(q);
+    }
+
     if (!ost->stream_copy) {
         const char *p = NULL;
         char *frame_size = NULL;
-        char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL;
+        char *frame_pix_fmt = NULL;
         char *intra_matrix = NULL, *inter_matrix = NULL;
         int do_pass = 0;
         int i;
@@ -1195,17 +1206,6 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
             exit(1);
         }
 
-        MATCH_PER_STREAM_OPT(frame_aspect_ratios, str, frame_aspect_ratio, oc, st);
-        if (frame_aspect_ratio) {
-            AVRational q;
-            if (av_parse_ratio(&q, frame_aspect_ratio, 255, 0, NULL) < 0 ||
-                q.num <= 0 || q.den <= 0) {
-                av_log(NULL, AV_LOG_FATAL, "Invalid aspect ratio: %s\n", frame_aspect_ratio);
-                exit(1);
-            }
-            ost->frame_aspect_ratio = av_q2d(q);
-        }
-
         video_enc->bits_per_raw_sample = frame_bits_per_raw_sample;
         MATCH_PER_STREAM_OPT(frame_pix_fmts, str, frame_pix_fmt, oc, st);
         if (frame_pix_fmt && *frame_pix_fmt == '+') {
-- 
1.7.10.4