[FFmpeg-cvslog] ffmpeg: fix null pointer segfault on solaris. (ticket381)

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 13 14:16:55 2011 +0200| [f8a1fc262386f4404d2b609f7d826cf6d1b00b53] | committer: Michael Niedermayer

ffmpeg: fix null pointer segfault on solaris. (ticket381)

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

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

 avconv.c |    1 +
 ffmpeg.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/avconv.c b/avconv.c
index 360d451..974d464 100644
--- 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),
diff --git a/ffmpeg.c b/ffmpeg.c
index 6042b48..f0013c4 100644
--- 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),