diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 14:28:20 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 14:28:20 +0200 |
| commit | 9ccd90626f0ecef205faef1d25f0e3649d18e1b3 (patch) | |
| tree | 8462ebe21f1e5ce5dc07d64f5174ca579d8d4897 /ffmpeg_opt.c | |
| parent | b994788353ec39677d9f751da5cf754ef6247773 (diff) | |
| parent | 16b0c929621f84983b83b9735ce973acb12723bc (diff) | |
| download | ffmpeg-9ccd90626f0ecef205faef1d25f0e3649d18e1b3.tar.gz | |
Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'
* commit '16b0c929621f84983b83b9735ce973acb12723bc':
avconv: Add loop option.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index ded7e2ea53..573da723f6 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -627,6 +627,9 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->file_index = nb_input_files; ist->discard = 1; st->discard = AVDISCARD_ALL; + ist->nb_samples = 0; + ist->min_pts = INT64_MAX; + ist->max_pts = INT64_MIN; ist->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); @@ -1005,6 +1008,9 @@ static int open_input_file(OptionsContext *o, const char *filename) f->nb_streams = ic->nb_streams; f->rate_emu = o->rate_emu; f->accurate_seek = o->accurate_seek; + f->loop = o->loop; + f->duration = 0; + f->time_base = (AVRational){ 1, 1 }; #if HAVE_PTHREADS f->thread_queue_size = o->thread_queue_size > 0 ? o->thread_queue_size : 8; #endif @@ -3152,6 +3158,8 @@ const OptionDef options[] = { { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(dump_attachment) }, "extract an attachment into a file", "filename" }, + { "loop", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_INPUT | + OPT_OFFSET, { .off = OFFSET(loop) }, "set number of times input stream shall be looped", "loop count" }, { "debug_ts", OPT_BOOL | OPT_EXPERT, { &debug_ts }, "print timestamp debugging info" }, { "max_error_rate", HAS_ARG | OPT_FLOAT, { &max_error_rate }, |