[FFmpeg-cvslog] avformat/img2: Make AVOptions available to img* demuxers defined in other files

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 11 15:10:15 2014 +0200| [5303a644f5889bfda2bf3d7abf17ab9c23104586] | committer: Michael Niedermayer

avformat/img2: Make AVOptions available to img* demuxers defined in other files

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5303a644f5889bfda2bf3d7abf17ab9c23104586
---

 libavformat/img2.h    |    4 +++-
 libavformat/img2dec.c |    8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libavformat/img2.h b/libavformat/img2.h
index dc53c5c..58a6833 100644
--- a/libavformat/img2.h
+++ b/libavformat/img2.h
@@ -24,6 +24,7 @@
 
 #include <stdint.h>
 #include "avformat.h"
+#include "libavutil/opt.h"
 
 #if HAVE_GLOB
 #include <glob.h>
@@ -54,8 +55,9 @@ typedef struct {
     int ts_from_file;
 } VideoDemuxData;
 
+extern const AVOption ff_img_options[];
+
 int ff_img_read_header(AVFormatContext *s1);
 
 int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt);
-
 #endif
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index a82f50f..8bbcddc 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -503,7 +503,7 @@ static int img_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
 
 #define OFFSET(x) offsetof(VideoDemuxData, x)
 #define DEC AV_OPT_FLAG_DECODING_PARAM
-static const AVOption options[] = {
+const AVOption ff_img_options[] = {
     { "framerate",    "set the video framerate",             OFFSET(framerate),    AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0,   DEC },
     { "loop",         "force loop over input file sequence", OFFSET(loop),         AV_OPT_TYPE_INT,    {.i64 = 0   }, 0, 1,       DEC },
 
@@ -528,7 +528,7 @@ static const AVOption options[] = {
 static const AVClass img2_class = {
     .class_name = "image2 demuxer",
     .item_name  = av_default_item_name,
-    .option     = options,
+    .option     = ff_img_options,
     .version    = LIBAVUTIL_VERSION_INT,
 };
 AVInputFormat ff_image2_demuxer = {
@@ -548,7 +548,7 @@ AVInputFormat ff_image2_demuxer = {
 static const AVClass img2pipe_class = {
     .class_name = "image2pipe demuxer",
     .item_name  = av_default_item_name,
-    .option     = options,
+    .option     = ff_img_options,
     .version    = LIBAVUTIL_VERSION_INT,
 };
 AVInputFormat ff_image2pipe_demuxer = {
@@ -681,7 +681,7 @@ static int webp_probe(AVProbeData *p)
 static const AVClass imgname ## _class = {\
     .class_name = AV_STRINGIFY(imgname) " demuxer",\
     .item_name  = av_default_item_name,\
-    .option     = options,\
+    .option     = ff_img_options,\
     .version    = LIBAVUTIL_VERSION_INT,\
 };\
 AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\