diff --git a/avconv.c b/avconv.c index 360d4516cc..974d464e34 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 6042b48cd3..f0013c4ad7 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),