Commit aa1a1b24 authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Luca Barbato

avconv: Avoid theoretical NULL dereferences

Bug-Id: CID 1292519
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent a4d34e21
...@@ -2106,17 +2106,22 @@ static int transcode_init(void) ...@@ -2106,17 +2106,22 @@ static int transcode_init(void)
const char *in_codec_name = "?"; const char *in_codec_name = "?";
const char *encoder_name = "?"; const char *encoder_name = "?";
const char *out_codec_name = "?"; const char *out_codec_name = "?";
const AVCodecDescriptor *desc;
if (in_codec) { if (in_codec) {
decoder_name = in_codec->name; 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)) if (!strcmp(decoder_name, in_codec_name))
decoder_name = "native"; decoder_name = "native";
} }
if (out_codec) { if (out_codec) {
encoder_name = out_codec->name; 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)) if (!strcmp(encoder_name, out_codec_name))
encoder_name = "native"; encoder_name = "native";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment