aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Bardiaux <mbardiaux@peaktime.be>2004-10-07 03:20:27 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-10-07 03:20:27 +0000
commit791d8d1d67273e8cf948d816ef9e009581273832 (patch)
treeed8ca3f878a24a5eb82de968a9d94d07f959aac4
parent6c55b27f8f7b41c34ecaf1c7986f23809adc80e0 (diff)
downloadffmpeg-791d8d1d67273e8cf948d816ef9e009581273832.tar.gz
Doc improvement for -target patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 3569 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--doc/ffmpeg-doc.texi9
-rw-r--r--ffmpeg.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 1c78f1ad90..d1b80b342c 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -190,7 +190,7 @@ set the copyright
set the comment
@item -target type
-specify target file type ("vcd", "svcd" or "dvd"). All the format
+specify target file type ("vcd", "svcd", "dvd", "pal-vcd", "ntsc-svcd", ... ). All the format
options (bitrate, codecs, buffer sizes) are automatically set by this
option. You can just type:
@@ -198,6 +198,13 @@ option. You can just type:
ffmpeg -i myfile.avi -target vcd /tmp/vcd.mpg
@end example
+Nevertheless you can specify additional options as long as you know they do not compromise the
+standard, as in:
+
+@example
+ffmpeg -i myfile.avi -target vcd -bf 2 /tmp/vcd.mpg
+@end example
+
@item -hq
activate high quality settings
diff --git a/ffmpeg.c b/ffmpeg.c
index 62593e9a72..8ad18f395f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3746,7 +3746,7 @@ const OptionDef options[] = {
{ "re", OPT_BOOL | OPT_EXPERT, {(void*)&rate_emu}, "read input at native frame rate", "" },
{ "loop", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" },
{ "v", HAS_ARG, {(void*)opt_verbose}, "control amount of logging", "verbose" },
- { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\" or \"dvd\")", "type" },
+ { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
{ "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
{ "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
{ "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },