summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdutils.c10
-rw-r--r--cmdutils.h2
-rw-r--r--ffmpeg.c5
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
diff --git a/ffmpeg.c b/ffmpeg.c
index cadb654eb0..90fc37105b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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);
}
}