diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 05:38:02 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 05:38:02 +0400 |
commit | af4b1c02acf6923489d30349c4813a0d73b2f114 (patch) | |
tree | 72ba1faae0a32c3850d8a15fc07f282fec06c33c /ffmpeg.c | |
parent | 52b866471ec97dd03d92ad1df4c5bdba54f285c0 (diff) | |
parent | 77bd1bc73a1946b0f0ce09a7cbb242a65e138d06 (diff) |
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
avconv: use new options parser.
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 19 |
1 files changed, 5 insertions, 14 deletions
@@ -3152,22 +3152,13 @@ static void log_callback_null(void *ptr, int level, const char *fmt, va_list vl) { } -static void parse_cpuflags(int argc, char **argv, const OptionDef *options) -{ - int idx = locate_option(argc, argv, options, "cpuflags"); - if (idx && argv[idx + 1]) - opt_cpuflags(NULL, "cpuflags", argv[idx + 1]); -} - int main(int argc, char **argv) { - OptionsContext o = { 0 }; + int ret; int64_t ti; atexit(exit_program); - reset_options(&o, 0); - setvbuf(stderr,NULL,_IONBF,0); /* win32 runtime needs this */ av_log_set_flags(AV_LOG_SKIP_REPEATED); @@ -3192,10 +3183,10 @@ int main(int argc, char **argv) term_init(); - parse_cpuflags(argc, argv, options); - - /* parse options */ - parse_options(&o, argc, argv, options, opt_output_file); + /* parse options and open all input/output files */ + ret = ffmpeg_parse_options(argc, argv); + if (ret < 0) + exit(1); if (nb_output_files <= 0 && nb_input_files == 0) { show_usage(); |