diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 03:29:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 18:44:36 +0100 |
| commit | ded44bda27ec14aaa93152ad46b4e42d3064ad3c (patch) | |
| tree | 72f31a1d94278e0aec9016eb5eda13bb996ada53 | |
| parent | 384be84bbe8ac967245da80e92b05ee7e516739e (diff) | |
| download | ffmpeg-ded44bda27ec14aaa93152ad46b4e42d3064ad3c.tar.gz | |
ffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codec
Fixes part of ticket2236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 956f4087c6eb717e31f3b92fe03fd56a3747eccf)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_opt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 4d3633fbed..3c80a248c1 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1690,7 +1690,7 @@ static int open_output_file(OptionsContext *o, const char *filename) /* pick the "best" stream of each type */ /* video: highest resolution */ - if (!o->video_disable && oc->oformat->video_codec != AV_CODEC_ID_NONE) { + if (!o->video_disable && av_guess_codec(oc->oformat, NULL, filename, NULL, AVMEDIA_TYPE_VIDEO) != AV_CODEC_ID_NONE) { int area = 0, idx = -1; int qcr = avformat_query_codec(oc->oformat, oc->oformat->video_codec, 0); for (i = 0; i < nb_input_streams; i++) { @@ -1712,7 +1712,7 @@ static int open_output_file(OptionsContext *o, const char *filename) } /* audio: most channels */ - if (!o->audio_disable && oc->oformat->audio_codec != AV_CODEC_ID_NONE) { + if (!o->audio_disable && av_guess_codec(oc->oformat, NULL, filename, NULL, AVMEDIA_TYPE_AUDIO) != AV_CODEC_ID_NONE) { int channels = 0, idx = -1; for (i = 0; i < nb_input_streams; i++) { ist = input_streams[i]; |