diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-14 23:58:51 +0300 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-14 23:58:51 +0300 |
commit | 6c18f1cda2e2b2471ebf75d30d552cb0cb61b6ad (patch) | |
tree | 6364a8c8e75935e7bdd14e1f71cedd28be14e749 | |
parent | 3bf3fc0e5444a839a628b125d974cb5b4651f4f6 (diff) |
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
-rw-r--r-- | ffmpeg.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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); } |