From 956f4087c6eb717e31f3b92fe03fd56a3747eccf Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 2 Aug 2014 03:29:42 +0200
Subject: [PATCH] ffmpeg_opt: Use av_guess_codec() instead of
AVOutputFormat->*codec
Fixes part of ticket2236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
ffmpeg_opt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 2adefc5ca5a..99182e0914c 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1828,7 +1828,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++) {
@@ -1850,7 +1850,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];
--
GitLab