diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-08-22 10:09:11 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-08-22 14:26:23 +0200 |
| commit | 7af7b45c3802d3d75981057cfda1e1764e96c4da (patch) | |
| tree | b1b019c52434e67a8e0a5c18340532020835a5de | |
| parent | 25e4ec6aa14d5e9f2aebc87e1f076c4669f2e1f7 (diff) | |
| download | ffmpeg-7af7b45c3802d3d75981057cfda1e1764e96c4da.tar.gz | |
lavf/image2: extend start_number range to accept zero
Address trac ticket #2884.
| -rw-r--r-- | doc/muxers.texi | 2 | ||||
| -rw-r--r-- | libavformat/img2enc.c | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 73e4c54958..cc78b6e843 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -260,7 +260,7 @@ ffmpeg -i in.avi -f image2 -frames:v 1 img.jpeg @table @option @item start_number @var{number} Start the sequence from @var{number}. Default value is 1. Must be a -positive number. +non-negative number. @item -update @var{number} If @var{number} is nonzero, the filename will always be interpreted as just a diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 7b10623570..11223fba82 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -142,7 +142,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) static const AVOption muxoptions[] = { { "updatefirst", "continuously overwrite one file", OFFSET(update), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, ENC }, { "update", "continuously overwrite one file", OFFSET(update), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, ENC }, - { "start_number", "set first number in the sequence", OFFSET(img_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, ENC }, + { "start_number", "set first number in the sequence", OFFSET(img_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC }, { "strftime", "use strftime for filename", OFFSET(use_strftime), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, ENC }, { NULL }, }; diff --git a/libavformat/version.h b/libavformat/version.h index 956e6d6d94..1dfde221a2 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 14 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |