[SCM] libav/experimental: Rename the "-loop" option defined in ffmpeg.c to "-loop_input" ("-loop" conflicts with an AVOption)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:46:45 UTC 2013


The following commit has been merged in the experimental branch:
commit 6714e97c303a74f962baa04ec5af9f44bcc69e9e
Author: Luca Abeni <lucabe72 at email.it>
Date:   Tue Feb 28 11:32:31 2006 +0000

    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

diff --git a/ffmpeg.c b/ffmpeg.c
index 3644e34..84d0d5e 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" },

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list