diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 12:35:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 12:41:04 +0200 |
| commit | b7fc2693c70fe72936e4ce124c802ac23857c476 (patch) | |
| tree | 6633a69bc7ab53e1478bb2210e25b834da038aa5 /ffmpeg_opt.c | |
| parent | 6d77279ed81c5db8a9f7b895d5090c0328c12174 (diff) | |
| parent | 488a0fa68973d48e264d54f1722f7afb18afbea7 (diff) | |
Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'
* commit '488a0fa68973d48e264d54f1722f7afb18afbea7':
avconv: support -t as an input option.
Conflicts:
Changelog
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 35b12e5ff0..8ff5bdfbda 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -842,6 +842,7 @@ static int open_input_file(OptionsContext *o, const char *filename) f->ctx = ic; f->ist_index = nb_input_streams - ic->nb_streams; f->start_time = o->start_time; + f->recording_time = o->recording_time; f->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp); f->nb_streams = ic->nb_streams; f->rate_emu = o->rate_emu; @@ -2599,7 +2600,8 @@ const OptionDef options[] = { { "map_chapters", HAS_ARG | OPT_INT | OPT_EXPERT | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(chapters_input_file) }, "set chapters mapping", "input_file_index" }, - { "t", HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(recording_time) }, + { "t", HAS_ARG | OPT_TIME | OPT_OFFSET | + OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(recording_time) }, "record or transcode \"duration\" seconds of audio/video", "duration" }, { "to", HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(stop_time) }, |