aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Abeni <lucabe72@email.it>2006-02-28 11:32:31 +0000
committerLuca Abeni <lucabe72@email.it>2006-02-28 11:32:31 +0000
commit6714e97c303a74f962baa04ec5af9f44bcc69e9e (patch)
tree72c978dae9c9e3f21a32a8728ff22a97353d5ae4
parent24300af41691b09df6e798ba4db9e6fafcc432f5 (diff)
downloadffmpeg-6714e97c303a74f962baa04ec5af9f44bcc69e9e.tar.gz
Rename the "-loop" option defined in ffmpeg.c to "-loop_input" ("-loop"
conflicts with an AVOption) Originally committed as revision 5077 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 3644e34a0b..84d0d5eb2d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4025,7 +4025,7 @@ const OptionDef options[] = {
{ "hex", OPT_BOOL | OPT_EXPERT, {(void*)&do_hex_dump},
"when dumping packets, also dump the payload" },
{ "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)" },
+ { "loop_input", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" },
{ "loop_output", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&loop_output}, "number of times to loop output in formats that support looping (0 loops forever)", "" },
{ "v", HAS_ARG, {(void*)opt_verbose}, "control amount of logging", "verbose" },
{ "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },