From dbb03b8e47f905f0f7b10c3eb5ac11f9bfc793ff Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 14 Oct 2015 19:52:17 +0200 Subject: [PATCH] ffmpeg_opt: rename loop option to stream_loop The "loop" option is used in several demuxers (like img2dec) and muxers, using the same name in ffmpeg_opt breaks them. Feel free to revert this and replace by any other solution or rename both as preferred This is just as a quick fix to avoid the regression with existing command lines and to have both named the same (which does not work) Example: ./ffmpeg -loop 1 -i fate-suite/png1/lena-rgb24.png -t 1 test.avi will produce 25 frames with the img2dec loop but only 1 frame at 25fps with the ffmpeg loop option Signed-off-by: Michael Niedermayer --- ffmpeg_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 573da723f6..7139114e62 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -3158,7 +3158,7 @@ const OptionDef options[] = { { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(dump_attachment) }, "extract an attachment into a file", "filename" }, - { "loop", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_INPUT | + { "stream_loop", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_INPUT | OPT_OFFSET, { .off = OFFSET(loop) }, "set number of times input stream shall be looped", "loop count" }, { "debug_ts", OPT_BOOL | OPT_EXPERT, { &debug_ts }, "print timestamp debugging info" }, -- 2.11.0