Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'

[ffmpeg] / libavformat / img2enc.c

diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 175b854b6a655f8eab5a3cdd512e0f147c914dad..d162cef19622d8c8c0506784d30e4f8e8346fbe6 100644 (file)
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -27,6 +27,7 @@
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"
+#include "libavutil/opt.h"
 
 typedef struct {
     const AVClass *class;  /**< Class for private options. */
@@ -42,7 +43,6 @@ static int write_header(AVFormatContext *s)
     VideoMuxData *img = s->priv_data;
     const char *str;
 
-    img->img_number = 1;
     av_strlcpy(img->path, s->filename, sizeof(img->path));
 
     /* find format */
@@ -97,7 +97,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
         avio_close(pb[1]);
         avio_close(pb[2]);
     }else{
-        if(ff_guess_image2_codec(s->filename) == CODEC_ID_JPEG2000){
+        if(ff_guess_image2_codec(s->filename) == AV_CODEC_ID_JPEG2000){
             AVStream *st = s->streams[0];
             if(st->codec->extradata_size > 8 &&
                AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){
@@ -137,10 +137,10 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
 #define ENC AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption muxoptions[] = {
     { "updatefirst",  "", OFFSET(updatefirst),  AV_OPT_TYPE_INT,    {.dbl = 0},    0, 1, ENC },
+    { "start_number", "first number in the sequence", OFFSET(img_number), AV_OPT_TYPE_INT, {.dbl = 1}, 1, INT_MAX, ENC },
     { NULL },
 };
 
-
 #if CONFIG_IMAGE2_MUXER
 static const AVClass img2mux_class = {
     .class_name = "image2 muxer",
@@ -148,6 +148,7 @@ static const AVClass img2mux_class = {
     .option     = muxoptions,
     .version    = LIBAVUTIL_VERSION_INT,
 };
+
 AVOutputFormat ff_image2_muxer = {
     .name           = "image2",
     .long_name      = NULL_IF_CONFIG_SMALL("image2 sequence"),
@@ -155,7 +156,7 @@ AVOutputFormat ff_image2_muxer = {
                       "ppm,sgi,tga,tif,tiff,jp2,j2c,xwd,sun,ras,rs,im1,im8,im24,"
                       "sunras,xbm",
     .priv_data_size = sizeof(VideoMuxData),
-    .video_codec    = CODEC_ID_MJPEG,
+    .video_codec    = AV_CODEC_ID_MJPEG,
     .write_header   = write_header,
     .write_packet   = write_packet,
     .flags          = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS | AVFMT_NOFILE,
@@ -167,7 +168,7 @@ AVOutputFormat ff_image2pipe_muxer = {
     .name           = "image2pipe",
     .long_name      = NULL_IF_CONFIG_SMALL("piped image2 sequence"),
     .priv_data_size = sizeof(VideoMuxData),
-    .video_codec    = CODEC_ID_MJPEG,
+    .video_codec    = AV_CODEC_ID_MJPEG,
     .write_header   = write_header,
     .write_packet   = write_packet,
     .flags          = AVFMT_NOTIMESTAMPS | AVFMT_NODIMENSIONS