diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-11 11:50:32 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-08-18 08:48:30 +0200 |
| commit | 3c0df9058438b68925be2fc6f5af2a05086ad99e (patch) | |
| tree | bc1a2ace6271700af353e68bf7519ff2b852e1b1 /avconv_opt.c | |
| parent | 91e59fea30f57af7abd1ad6a68a8f6663805ee44 (diff) | |
avconv: make -shortest a per-output file option.
Diffstat (limited to 'avconv_opt.c')
| -rw-r--r-- | avconv_opt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/avconv_opt.c b/avconv_opt.c index 7b86d7613c..dc44986e68 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -1352,6 +1352,7 @@ loop_end: oc->duration = o->recording_time; output_files[nb_output_files - 1]->start_time = o->start_time; output_files[nb_output_files - 1]->limit_filesize = o->limit_filesize; + output_files[nb_output_files - 1]->shortest = o->shortest; av_dict_copy(&output_files[nb_output_files - 1]->opts, format_opts, 0); /* check filename in case of an image number is expected */ @@ -1836,7 +1837,7 @@ const OptionDef options[] = { { "adrift_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&audio_drift_threshold}, "audio drift threshold", "threshold" }, { "copyts", OPT_BOOL | OPT_EXPERT, {(void*)©_ts}, "copy timestamps" }, { "copytb", OPT_BOOL | OPT_EXPERT, {(void*)©_tb}, "copy input stream time base when stream copying" }, - { "shortest", OPT_BOOL | OPT_EXPERT, {(void*)&opt_shortest}, "finish encoding within shortest input" }, // + { "shortest", OPT_BOOL | OPT_EXPERT | OPT_OFFSET, {.off = OFFSET(shortest)}, "finish encoding within shortest input" }, { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&dts_delta_threshold}, "timestamp discontinuity delta threshold", "threshold" }, { "xerror", OPT_BOOL, {(void*)&exit_on_error}, "exit on error", "error" }, { "copyinkf", OPT_BOOL | OPT_EXPERT | OPT_SPEC, {.off = OFFSET(copy_initial_nonkeyframes)}, "copy initial non-keyframes" }, |