diff options
| author | Marton Balint <cus@passwd.hu> | 2022-06-12 23:50:55 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2022-07-07 20:23:06 +0200 |
| commit | 3f2de562c354002c27982c3b2d4d325f079e828f (patch) | |
| tree | 953c8ed8c8d704531910bbfed242ca3d7317ecf0 /libavformat/img2enc.c | |
| parent | 6ed9eaf664a220812abe75057e3319745a98f4b8 (diff) | |
| download | ffmpeg-3f2de562c354002c27982c3b2d4d325f079e828f.tar.gz | |
avformat/img2enc: fix first image check
Start image number was hardcoded to 1 for the first image check.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/img2enc.c')
| -rw-r--r-- | libavformat/img2enc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 0a11fae34e..133487288e 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -36,6 +36,7 @@ typedef struct VideoMuxData { const AVClass *class; /**< Class for private options. */ + int start_img_number; int img_number; int split_planes; /**< use independent file for each Y, U, V plane */ char tmp[4][1024]; @@ -69,6 +70,7 @@ static int write_header(AVFormatContext *s) &&(desc->flags & AV_PIX_FMT_FLAG_PLANAR) && desc->nb_components >= 3; } + img->img_number = img->start_img_number; return 0; } @@ -162,7 +164,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) } else if (av_get_frame_filename2(filename, sizeof(filename), s->url, img->img_number, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0 && - img->img_number > 1) { + img->img_number > img->start_img_number) { av_log(s, AV_LOG_ERROR, "Could not get frame filename number %d from pattern '%s'. " "Use '-frames:v 1' for a single image, or '-update' option, or use a pattern such as %%03d within the filename.\n", @@ -246,7 +248,7 @@ static int query_codec(enum AVCodecID id, int std_compliance) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption muxoptions[] = { { "update", "continuously overwrite one file", OFFSET(update), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, - { "start_number", "set first number in the sequence", OFFSET(img_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC }, + { "start_number", "set first number in the sequence", OFFSET(start_img_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC }, { "strftime", "use strftime for filename", OFFSET(use_strftime), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, { "frame_pts", "use current frame pts for filename", OFFSET(frame_pts), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, { "atomic_writing", "write files atomically (using temporary files and renames)", OFFSET(use_rename), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, |