diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-03-29 07:48:27 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-04-15 20:23:09 +0200 |
| commit | 6c9eac19988fb85d9bf911e20e9675d814ab10dd (patch) | |
| tree | ae4494e8189855284b727485eeb40dbca83c86e3 | |
| parent | e77c86629fe803bc07ccfe323151486fe977b133 (diff) | |
| download | ffmpeg-6c9eac19988fb85d9bf911e20e9675d814ab10dd.tar.gz | |
avconv: don't set output width/height directly from input value.
Always take it from lavfi. This way we don't need a clearly defined
corresponding input stream.
| -rw-r--r-- | avconv.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -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 |