[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c,1.369,1.370

Luca Abeni CVS lucabe
Tue Feb 28 12:32:34 CET 2006


Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv20797

Modified Files:
	ffmpeg.c 
Log Message:
Rename the "-loop" option defined in ffmpeg.c to "-loop_input" ("-loop"
conflicts with an AVOption)


Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -d -r1.369 -r1.370
--- ffmpeg.c	13 Feb 2006 15:36:13 -0000	1.369
+++ ffmpeg.c	28 Feb 2006 11:32:31 -0000	1.370
@@ -4025,7 +4025,7 @@
     { "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" },





More information about the ffmpeg-cvslog mailing list