diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-13 14:16:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-13 14:27:49 +0200 |
| commit | f8a1fc262386f4404d2b609f7d826cf6d1b00b53 (patch) | |
| tree | c3ba2312cf2169dc2f9868098b0476eafaf69ddc /ffmpeg.c | |
| parent | 36e0585a0000743f1ca85d4987ba4c26696b1df9 (diff) | |
| download | ffmpeg-f8a1fc262386f4404d2b609f7d826cf6d1b00b53.tar.gz | |
ffmpeg: fix null pointer segfault on solaris. (ticket381)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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), |