summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-09 13:07:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-10 02:13:11 +0200
commitffd894917fd5aaab9bb462ddc85ddb71b02b7346 (patch)
treeb804b46931629cf06a256bc2a9e0b28e16a59302
parent3fedff39852553692b5cb6222ff5d9f492f3d559 (diff)
downloadffmpeg-ffd894917fd5aaab9bb462ddc85ddb71b02b7346.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>
-rw-r--r--ffmpeg_opt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 8b2b83e5f3..cd437527a3 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2617,7 +2617,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" },