ffmpeg: fix null pointer segfault on solaris. (ticket381)
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Aug 2011 12:16:55 +0000 (14:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Aug 2011 12:27:49 +0000 (14:27 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avconv.c
ffmpeg.c

index 360d451..974d464 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -631,6 +631,7 @@ static void choose_sample_fmt(AVStream *st, AVCodec *codec)
         if (*p == -1) {
             if((codec->capabilities & CODEC_CAP_LOSSLESS) && av_get_sample_fmt_name(st->codec->sample_fmt) > av_get_sample_fmt_name(codec->sample_fmts[0]))
                 av_log(NULL, AV_LOG_ERROR, "Convertion will not be lossless'\n");
+            if(av_get_sample_fmt_name(st->codec->sample_fmt))
             av_log(NULL, AV_LOG_WARNING,
                    "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n",
                    av_get_sample_fmt_name(st->codec->sample_fmt),
index 6042b48..f0013c4 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -639,6 +639,7 @@ static void choose_sample_fmt(AVStream *st, AVCodec *codec)
         if (*p == -1) {
             if((codec->capabilities & CODEC_CAP_LOSSLESS) && av_get_sample_fmt_name(st->codec->sample_fmt) > av_get_sample_fmt_name(codec->sample_fmts[0]))
                 av_log(NULL, AV_LOG_ERROR, "Convertion will not be lossless'\n");
+            if(av_get_sample_fmt_name(st->codec->sample_fmt))
             av_log(NULL, AV_LOG_WARNING,
                    "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n",
                    av_get_sample_fmt_name(st->codec->sample_fmt),