ffmpeg: check encoder earlier.
authorNicolas George <nicolas.george@normalesup.org>
Fri, 20 Apr 2012 13:17:38 +0000 (15:17 +0200)
committerNicolas George <nicolas.george@normalesup.org>
Fri, 20 Apr 2012 14:30:58 +0000 (16:30 +0200)
Fixes a segfault with Ogg output, libtheora not compiled in
and no codec specified.

ffmpeg.c

index 3e77610..0721a04 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3013,6 +3013,12 @@ static int transcode_init(void)
         } else {
             if (!ost->enc)
                 ost->enc = avcodec_find_encoder(codec->codec_id);
+            if (!ost->enc) {
+                snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d",
+                         avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index);
+                ret = AVERROR(EINVAL);
+                goto dump_format;
+            }
 
             if (ist)
                 ist->decoding_needed = 1;
@@ -3154,12 +3160,6 @@ static int transcode_init(void)
         if (ost->encoding_needed) {
             AVCodec      *codec = ost->enc;
             AVCodecContext *dec = NULL;
-            if (!codec) {
-                snprintf(error, sizeof(error), "Encoder (codec %s) not found for output stream #%d:%d",
-                         avcodec_get_name(ost->st->codec->codec_id), ost->file_index, ost->index);
-                ret = AVERROR(EINVAL);
-                goto dump_format;
-            }
 
             if ((ist = get_input_stream(ost)))
                 dec = ist->st->codec;