avconv: don't set output width/height directly from input value.
authorAnton Khirnov <anton@khirnov.net>
Thu, 29 Mar 2012 05:48:27 +0000 (07:48 +0200)
committerAnton Khirnov <anton@khirnov.net>
Sun, 15 Apr 2012 18:23:09 +0000 (20:23 +0200)
Always take it from lavfi. This way we don't need a clearly defined
corresponding input stream.

avconv.c

index a516fb7..c343ef0 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -561,7 +561,6 @@ static int configure_video_filters(InputStream *ist, OutputStream *ost)
     AVFilterContext *last_filter, *filter;
     /** filter graph containing all filters including input & output */
     AVCodecContext *codec = ost->st->codec;
-    AVCodecContext *icodec = ist->st->codec;
     SinkContext sink_ctx = { .pix_fmts = choose_pixel_fmts(ost) };
     AVRational sample_aspect_ratio;
     char args[255];
@@ -588,7 +587,7 @@ static int configure_video_filters(InputStream *ist, OutputStream *ost)
         return ret;
     last_filter = ost->input_video_filter;
 
-    if (codec->width != icodec->width || codec->height != icodec->height) {
+    if (codec->width || codec->height) {
         snprintf(args, 255, "%d:%d:flags=0x%X",
                  codec->width,
                  codec->height,
@@ -2389,11 +2388,6 @@ static int transcode_init(void)
                 ost->resample_channels    = icodec->channels;
                 break;
             case AVMEDIA_TYPE_VIDEO:
-                if (!codec->width || !codec->height) {
-                    codec->width  = icodec->width;
-                    codec->height = icodec->height;
-                }
-
                 /*
                  * We want CFR output if and only if one of those is true:
                  * 1) user specified output framerate with -r