[FFmpeg-cvslog] ffmpeg: Avoid null pointer dereferences

[Himangi Saraogi]

ffmpeg | branch: master | Himangi Saraogi <himangi774 at gmail.com> | Thu Apr  2 16:40:19 2015 +0530| [d768f8f5cfe876cd8eedb045eeb87e307ac4a674] | committer: Michael Niedermayer

ffmpeg: Avoid null pointer dereferences

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d768f8f5cfe876cd8eedb045eeb87e307ac4a674
---

 ffmpeg.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 67ce1f3..8bf507a 100644
--- 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";
             }