aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg_opt.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-03-16 11:05:45 +0100
committerNicolas George <nicolas.george@normalesup.org>2013-03-16 17:20:19 +0100
commit639a9e21a63a58c32a1e3d9fe51dc9c00794756b (patch)
treed9b7b83fe2a8dd93ce7efb1fb6754daa501ab88a /ffmpeg_opt.c
parenta77f453703680fc197489730c2655c8273f23164 (diff)
downloadandroid_external_ffmpeg-639a9e21a63a58c32a1e3d9fe51dc9c00794756b.tar.gz
android_external_ffmpeg-639a9e21a63a58c32a1e3d9fe51dc9c00794756b.tar.bz2
android_external_ffmpeg-639a9e21a63a58c32a1e3d9fe51dc9c00794756b.zip
ffmpeg_opt: add OPT_INPUT to -fix_sub_duration and -canvas_size.
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index e6fab2a55c..728d4745a4 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2733,9 +2733,9 @@ const OptionDef options[] = {
"force subtitle codec ('copy' to copy stream)", "codec" },
{ "stag", OPT_SUBTITLE | HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_old2new }
, "force subtitle tag/fourcc", "fourcc/tag" },
- { "fix_sub_duration", OPT_BOOL | OPT_EXPERT | OPT_SUBTITLE | OPT_SPEC, { .off = OFFSET(fix_sub_duration) },
+ { "fix_sub_duration", OPT_BOOL | OPT_EXPERT | OPT_SUBTITLE | OPT_SPEC | OPT_INPUT, { .off = OFFSET(fix_sub_duration) },
"fix subtitles duration" },
- { "canvas_size", OPT_SUBTITLE | HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(canvas_sizes) },
+ { "canvas_size", OPT_SUBTITLE | HAS_ARG | OPT_STRING | OPT_SPEC | OPT_INPUT, { .off = OFFSET(canvas_sizes) },
"set canvas size (WxH or abbreviation)", "size" },
/* grab options */