diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 05:15:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 14:17:10 +0200 |
commit | cbb2c95e47cd83cb65b2ce77cbb0296e85fa506b (patch) | |
tree | b6561df8528ec04a8ceac25efee7ed0adb53543f /ffmpeg.c | |
parent | dfd8f2ff195f3267bf266d96bc4b7cea4acf43a3 (diff) | |
download | ffmpeg-cbb2c95e47cd83cb65b2ce77cbb0296e85fa506b.tar.gz |
ffmpeg: init simple filter graph before trying to extract framerate from its output.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -3078,6 +3078,17 @@ static int transcode_init(void) ist->decoding_needed = 1; ost->encoding_needed = 1; + if (!ost->filter && + (codec->codec_type == AVMEDIA_TYPE_VIDEO || + codec->codec_type == AVMEDIA_TYPE_AUDIO)) { + FilterGraph *fg; + fg = init_simple_filtergraph(ist, ost); + if (configure_filtergraph(fg)) { + av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n"); + exit(1); + } + } + if (codec->codec_type == AVMEDIA_TYPE_VIDEO) { if (ost->filter && !ost->frame_rate.num) ost->frame_rate = av_buffersink_get_frame_rate(ost->filter->filter); @@ -3090,17 +3101,6 @@ static int transcode_init(void) } } - if (!ost->filter && - (codec->codec_type == AVMEDIA_TYPE_VIDEO || - codec->codec_type == AVMEDIA_TYPE_AUDIO)) { - FilterGraph *fg; - fg = init_simple_filtergraph(ist, ost); - if (configure_filtergraph(fg)) { - av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n"); - exit(1); - } - } - switch (codec->codec_type) { case AVMEDIA_TYPE_AUDIO: codec->sample_fmt = ost->filter->filter->inputs[0]->format; |