diff options
author | Himangi Saraogi <himangi774@gmail.com> | 2015-04-02 16:22:19 +0530 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-02 13:06:00 +0200 |
commit | d768f8f5cfe876cd8eedb045eeb87e307ac4a674 (patch) | |
tree | 47148f06a1e39ad178cabdbc3805f6c0e7231ee9 /ffmpeg.c | |
parent | 80be7daaa8ddf0716c413df17e75e5beffbc2a64 (diff) | |
download | ffmpeg-d768f8f5cfe876cd8eedb045eeb87e307ac4a674.tar.gz |
ffmpeg: Avoid null pointer dereferences
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -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"; } |