ffmpeg: Avoid null pointer dereferences
authorHimangi Saraogi <himangi774@gmail.com>
Thu, 2 Apr 2015 10:52:19 +0000 (16:22 +0530)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 2 Apr 2015 11:06:00 +0000 (13:06 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c

index 67ce1f3..8bf507a 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3171,17 +3171,22 @@ static int transcode_init(void)
             const char *in_codec_name  = "?";
             const char *encoder_name   = "?";
             const char *out_codec_name = "?";
+            const AVCodecDescriptor *desc;
 
             if (in_codec) {
                 decoder_name  = in_codec->name;
-                in_codec_name = avcodec_descriptor_get(in_codec->id)->name;
+                desc = avcodec_descriptor_get(in_codec->id);
+                if (desc)
+                    in_codec_name = desc->name;
                 if (!strcmp(decoder_name, in_codec_name))
                     decoder_name = "native";
             }
 
             if (out_codec) {
                 encoder_name   = out_codec->name;
-                out_codec_name = avcodec_descriptor_get(out_codec->id)->name;
+                desc = avcodec_descriptor_get(out_codec->id);
+                if (desc)
+                    out_codec_name = desc->name;
                 if (!strcmp(encoder_name, out_codec_name))
                     encoder_name = "native";
             }