diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-09 13:07:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-21 20:43:39 +0200 |
| commit | 9fb1c02f3097cc411f0816655349e95f0c7c1624 (patch) | |
| tree | 0e83102b22b4e256914556a544b31bea6ca8e84d /ffmpeg_opt.c | |
| parent | 4a49f1e764d2fe2060f38f6b671fd3c0d3bbfa13 (diff) | |
| download | ffmpeg-9fb1c02f3097cc411f0816655349e95f0c7c1624.tar.gz | |
ffmpeg_opt: Fix -timestamp parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 107e4da47644fe615ea821d6a19682d73789aca7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 1f281f605a..ad082ac282 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2825,7 +2825,7 @@ const OptionDef options[] = { { "itsscale", HAS_ARG | OPT_DOUBLE | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(ts_scale) }, "set the input ts scale", "scale" }, - { "timestamp", HAS_ARG | OPT_PERFILE, { .func_arg = opt_recording_timestamp }, + { "timestamp", HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_recording_timestamp }, "set the recording timestamp ('now' to set the current time)", "time" }, { "metadata", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(metadata) }, "add metadata", "string=string" }, |