Browse Source

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.9
Michael Niedermayer 14 years ago
parent
commit
f8a1fc2623
2 changed files with 2 additions and 0 deletions
  1. +1
    -0
      avconv.c
  2. +1
    -0
      ffmpeg.c

+ 1
- 0
avconv.c View File

@@ -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),


+ 1
- 0
ffmpeg.c View File

@@ -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),


Loading…
Cancel
Save