generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make ffmpeg warns the user when the selected sample format is ignored.

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fa34a3626c)
This commit is contained in:
Stefano Sabatini 2011-01-14 15:50:55 +01:00 committed by Michael Niedermayer
parent a4257d74e0
commit 5a8d1075ec
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg.c
View File

@ -600,8 +600,14 @@ static void choose_sample_fmt(AVStream *st, AVCodec *codec)
if(*p == st->codec->sample_fmt) if(*p == st->codec->sample_fmt)
break; break;
} }
if(*p == -1) if (*p == -1) {
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),
codec->name,
av_get_sample_fmt_name(codec->sample_fmts[0]));
st->codec->sample_fmt = codec->sample_fmts[0]; st->codec->sample_fmt = codec->sample_fmts[0];
}
} }
} }