Skip to content

F
ffmpeg.wasm-core
Commit f8a1fc26 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

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

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 36e0585a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
avconv.c
View file @ f8a1fc26
......@@ -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),
......
ffmpeg.c
View file @ f8a1fc26
......@@ -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),
......
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