summaryrefslogtreecommitdiffstats
path: root/libavformat/img2dec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2019-02-10 18:56:46 +0100
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2019-02-10 18:56:46 +0100
commit6de396c2168e944a854e29766c5ddd9d2d4a20a8 (patch)
treebc07368813e1ea9b7344313720ab33a0f06de48d /libavformat/img2dec.c
parent826cc58debfe51f4ce7bd99d28f742904e046af7 (diff)
downloadffmpeg-streaming-6de396c2168e944a854e29766c5ddd9d2d4a20a8.zip
ffmpeg-streaming-6de396c2168e944a854e29766c5ddd9d2d4a20a8.tar.gz
lavf/img2: Move "loop" into common options.
While the image2pipe demuxer ignores the option - confusing users - the autodetecting demuxers that are favoured over image2 act on it.
Diffstat (limited to 'libavformat/img2dec.c')
-rw-r--r--libavformat/img2dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 795f54d..ecec498 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -568,11 +568,11 @@ static int img_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
{ "framerate", "set the video framerate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC }, \
{ "pixel_format", "set video pixel format", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, \
{ "video_size", "set video size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC }, \
+ { "loop", "force loop over input file sequence", OFFSET(loop), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, DEC }, \
{ NULL },
#if CONFIG_IMAGE2_DEMUXER
const AVOption ff_img_options[] = {
- { "loop", "force loop over input file sequence", OFFSET(loop), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, DEC },
{ "pattern_type", "set pattern type", OFFSET(pattern_type), AV_OPT_TYPE_INT, {.i64=PT_DEFAULT}, 0, INT_MAX, DEC, "pattern_type"},
{ "glob_sequence","select glob/sequence pattern type", 0, AV_OPT_TYPE_CONST, {.i64=PT_GLOB_SEQUENCE}, INT_MIN, INT_MAX, DEC, "pattern_type" },
{ "glob", "select glob pattern type", 0, AV_OPT_TYPE_CONST, {.i64=PT_GLOB }, INT_MIN, INT_MAX, DEC, "pattern_type" },
OpenPOWER on IntegriCloud