generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avconv: don't set output width/height directly from input value.

Browse Source 
Always take it from lavfi. This way we don't need a clearly defined
corresponding input stream.
This commit is contained in:
Anton Khirnov 2012-03-29 07:48:27 +02:00
parent e77c86629f
commit 6c9eac1998
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
avconv.c
View File

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