Revision 1af2ca78 ffmpeg.c

View differences:

ffmpeg.c
80 80
extern const OptionDef options[];
81 81

  
82 82
static void show_help(void);
83
static void show_license(void);
83
static void opt_show_license(void);
84 84
static int opt_default(const char *opt, const char *arg);
85 85

  
86 86
#define MAX_FILES 20
......
3187 3187
extern int ffm_nopts;
3188 3188
#endif
3189 3189

  
3190
static void show_formats(void)
3190
static void opt_show_formats(void)
3191 3191
{
3192 3192
    AVInputFormat *ifmt;
3193 3193
    AVOutputFormat *ofmt;
......
3536 3536
    *bsfp= bsfc;
3537 3537
}
3538 3538

  
3539
static void show_version(void)
3539
static void opt_show_version(void)
3540 3540
{
3541 3541
    /* TODO: add function interface to avutil and avformat */
3542 3542
    fprintf(stderr, "ffmpeg      " FFMPEG_VERSION "\n"
......
3591 3591

  
3592 3592
const OptionDef options[] = {
3593 3593
    /* main options */
3594
    { "L", 0, {(void*)show_license}, "show license" },
3594
    { "L", 0, {(void*)opt_show_license}, "show license" },
3595 3595
    { "h", 0, {(void*)opt_show_help}, "show help" },
3596
    { "version", 0, {(void*)show_version}, "show version" },
3597
    { "formats", 0, {(void*)show_formats}, "show available formats, codecs, protocols, ..." },
3596
    { "version", 0, {(void*)opt_show_version}, "show version" },
3597
    { "formats", 0, {(void*)opt_show_formats}, "show available formats, codecs, protocols, ..." },
3598 3598
    { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
3599 3599
    { "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" },
3600 3600
    { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
......
3725 3725
#endif
3726 3726
}
3727 3727

  
3728
static void show_license(void)
3728
static void opt_show_license(void)
3729 3729
{
3730 3730
#ifdef CONFIG_GPL
3731 3731
    printf(

Also available in: Unified diff