From 6c18f1cda2e2b2471ebf75d30d552cb0cb61b6ad Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 14 Jan 2011 20:58:51 +0000 Subject: Make opt_audio_sample_fmt() abort in case of invalid sample format name. Originally committed as revision 26335 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 9c434b2bae..d2a7b6a3c2 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2877,9 +2877,13 @@ static int opt_thread_count(const char *opt, const char *arg) static void opt_audio_sample_fmt(const char *arg) { - if (strcmp(arg, "list")) + if (strcmp(arg, "list")) { audio_sample_fmt = av_get_sample_fmt(arg); - else { + if (audio_sample_fmt == AV_SAMPLE_FMT_NONE) { + av_log(NULL, AV_LOG_ERROR, "Invalid sample format '%s'\n", arg); + ffmpeg_exit(1); + } + } else { list_fmts(av_get_sample_fmt_string, AV_SAMPLE_FMT_NB); ffmpeg_exit(0); } -- cgit v1.2.3