diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-03-12 14:44:22 +0300 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-05-10 09:14:13 +0400 |
commit | 5d2c6f42d74680dbb2f94c16770114f18c2d2fd0 (patch) | |
tree | 2b790c69eb17a927c6ae79cb83ac66be6c4e24e7 | |
parent | c3e40410d4a932c6f27b0217e0ab705f03841078 (diff) |
cmdutils: remove list_fmts(), simplify
The function was only used in opt_sample_fmt() for listing the sample
formats. Move list_fmts() functionality directly into
opt_sample_fmt().
Also fix the warning:
ffmpeg.c: In function ‘opt_audio_sample_fmt’:
ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type
cmdutils.h:163: note: expected ‘void (*)(char *, int, int)’ but argument is of type ‘char * (*)(char *, int, enum AVSampleFormat)’
Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r-- | cmdutils.c | 10 | ||||
-rw-r--r-- | cmdutils.h | 2 | ||||
-rw-r--r-- | ffmpeg.c | 5 |
3 files changed, 4 insertions, 13 deletions
diff --git a/cmdutils.c b/cmdutils.c index f770c7963d..59f0ce7fd1 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -571,16 +571,6 @@ void show_license(void) ); } -void list_fmts(void (*get_fmt_string)(char *buf, int buf_size, int fmt), int nb_fmts) -{ - int i; - char fmt_str[128]; - for (i=-1; i < nb_fmts; i++) { - get_fmt_string (fmt_str, sizeof(fmt_str), i); - fprintf(stdout, "%s\n", fmt_str); - } -} - void show_formats(void) { AVInputFormat *ifmt=NULL; diff --git a/cmdutils.h b/cmdutils.h index 0a61efb215..bb8d779a75 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -161,8 +161,6 @@ void set_context_opts(void *ctx, void *opts_ctx, int flags, AVCodec *codec); */ void print_error(const char *filename, int err); -void list_fmts(void (*get_fmt_string)(char *buf, int buf_size, int fmt), int nb_fmts); - /** * Print the program banner to stderr. The banner contents depend on the * current version of the repository and of the libav* libraries used by @@ -2859,7 +2859,10 @@ static void opt_audio_sample_fmt(const char *arg) ffmpeg_exit(1); } } else { - list_fmts(av_get_sample_fmt_string, AV_SAMPLE_FMT_NB); + int i; + char fmt_str[128]; + for (i = -1; i < AV_SAMPLE_FMT_NB; i++) + printf("%s\n", av_get_sample_fmt_string(fmt_str, sizeof(fmt_str), i)); ffmpeg_exit(0); } } |