[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec opt.c, 1.1, 1.2 avcodec.h, 1.417, 1.418

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv32599

Modified Files:
	opt.c avcodec.h 
Log Message:
AVOption enumeration support and some flags to classify AVOptions


Index: opt.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/opt.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- opt.c	6 Sep 2005 12:51:56 -0000	1.1
+++ opt.c	6 Sep 2005 21:32:18 -0000	1.2
@@ -46,6 +46,12 @@
     return NULL;
 }
 
+AVOption *av_next_option(void *obj, AVOption *last){
+    if(last && last[1].name) return ++last;
+    else if(last)            return NULL;
+    else                     return (*(AVClass**)obj)->option;
+}
+
 static int av_set_number(void *obj, const char *name, double num, int den, int64_t intnum){
     AVOption *o= find_opt(obj, name);
     void *dst;

Index: avcodec.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -d -r1.417 -r1.418
--- avcodec.h	6 Sep 2005 12:51:56 -0000	1.417
+++ avcodec.h	6 Sep 2005 21:32:18 -0000	1.418
@@ -21,8 +21,8 @@
 #define AV_STRINGIFY(s)	AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVCODEC_VERSION_INT ((49<<16)+(1<<8)+0)
-#define LIBAVCODEC_VERSION     49.1.0
+#define LIBAVCODEC_VERSION_INT ((49<<16)+(2<<8)+0)
+#define LIBAVCODEC_VERSION     49.2.0
 #define LIBAVCODEC_BUILD       LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT       "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -698,6 +698,11 @@
     double default_val;
     double min;
     double max;
+    
+    int flags;
+#define AV_OPT_FLAG_ENCODING_PARAM  1   ///< a generic parameter which can be set by the user for muxing or encoding
+#define AV_OPT_FLAG_DECODING_PARAM  2   ///< a generic parameter which can be set by the user for demuxing or decoding
+#define AV_OPT_FLAG_METADATA        4   ///< some data extracted or inserted into the file like title, comment, ...
 } AVOption;
 
 /**
@@ -1883,6 +1888,7 @@
 int av_set_int(void *obj, const char *name, int64_t n);
 const char *av_get_string(void *obj, const char *name);
 double av_get_double(void *obj, const char *name);
+AVOption *av_next_option(void *obj, AVOption *last);
 
 
 /**