virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avtools: parse loglevel before all the other options.

Browse Source 
This way it can be applied to cmdutils too -- e.g. showing the banner
and printing startup messages.
This commit is contained in:
Anton Khirnov 2011-09-26 08:15:37 +02:00
parent 4ca59d1948
commit 182cbe433a
7 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
avconv.c
View File

@ -4019,6 +4019,7 @@ int main(int argc, char **argv)
reset_options(&o);
av_log_set_flags(AV_LOG_SKIP_REPEATED);
parse_loglevel(argc, argv, options);
avcodec_register_all();
#if CONFIG_AVDEVICE

1
avplay.c
View File

@ -3050,6 +3050,7 @@ int main(int argc, char **argv)
int flags;
av_log_set_flags(AV_LOG_SKIP_REPEATED);
parse_loglevel(argc, argv, options);
/* register all codecs, demux and protocols */
avcodec_register_all();

1
avprobe.c
View File

@ -399,6 +399,7 @@ int main(int argc, char **argv)
{
int ret;
parse_loglevel(argc, argv, options);
av_register_all();
init_opts();
#if CONFIG_AVDEVICE

1
avserver.c
View File

@ -4668,6 +4668,7 @@ int main(int argc, char **argv)
{
struct sigaction sigact;
parse_loglevel(argc, argv, options);
av_register_all();
show_banner();

35
cmdutils.c
View File

@ -304,6 +304,41 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options
}
}
/*
* Return index of option opt in argv or 0 if not found.
*/
static int locate_option(int argc, char **argv, const OptionDef *options, const char *optname)
{
const OptionDef *po;
int i;
for (i = 1; i < argc; i++) {
const char *cur_opt = argv[i];
if (*cur_opt++ != '-')
continue;
po = find_option(options, cur_opt);
if (!po->name && cur_opt[0] == 'n' && cur_opt[1] == 'o')
po = find_option(options, cur_opt + 2);
if ((!po->name && !strcmp(cur_opt, optname)) ||
(po->name && !strcmp(optname, po->name)))
return i;
if (!po || po->flags & HAS_ARG)
i++;
}
return 0;
}
void parse_loglevel(int argc, char **argv, const OptionDef *options)
{
int idx = locate_option(argc, argv, options, "loglevel");
if (idx && argv[idx + 1])
opt_loglevel("loglevel", argv[idx + 1]);
}
#define FLAGS (o->type == FF_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0
int opt_default(const char *opt, const char *arg)
{

5
cmdutils.h
View File

@ -174,6 +174,11 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options
*/
int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options);
/**
* Find the '-loglevel' option in the commandline args and apply it.
*/
void parse_loglevel(int argc, char **argv, const OptionDef *options);
/**
* Check if the given stream matches a stream specifier.
*

1
ffmpeg.c
View File

@ -4357,6 +4357,7 @@ int main(int argc, char **argv)
int64_t ti;
av_log_set_flags(AV_LOG_SKIP_REPEATED);
parse_loglevel(argc, argv, options);
avcodec_register_all();
#if CONFIG_AVDEVICE