[FFmpeg-cvslog] r16134 - in trunk/libavcodec: avcodec.h opt.c

[stefano]

Author: stefano
Date: Sun Dec 14 22:34:12 2008
New Revision: 16134

Log:
Remove set_all_opt() and its use in av_set_string2(). Make
av_set_string() and av_set_string2() do not accept as parameter the
name of a named constant.

This avoids av_set_string2() and av_set_string() to misbehave when
there is an option and a named constant with the same name.

See the thread: "[PATCH] Remove libavcodec/opt.c:set_all_opt()".


Modified:
   trunk/libavcodec/avcodec.h
   trunk/libavcodec/opt.c

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Sun Dec 14 22:34:12 2008
@@ -31,7 +31,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 52
 #define LIBAVCODEC_VERSION_MINOR  6
-#define LIBAVCODEC_VERSION_MICRO  2
+#define LIBAVCODEC_VERSION_MICRO  3
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \

Modified: trunk/libavcodec/opt.c
==============================================================================
--- trunk/libavcodec/opt.c	(original)
+++ trunk/libavcodec/opt.c	Sun Dec 14 22:34:12 2008
@@ -76,24 +76,6 @@ static const AVOption *av_set_number(voi
     return o;
 }
 
-static const AVOption *set_all_opt(void *v, const char *unit, double d){
-    AVClass *c= *(AVClass**)v; //FIXME silly way of storing AVClass
-    const AVOption *o= c->option;
-    const AVOption *ret=NULL;
-
-    for(;o && o->name; o++){
-        if(o->type != FF_OPT_TYPE_CONST && o->unit && !strcmp(o->unit, unit)){
-            double tmp= d;
-            if(o->type == FF_OPT_TYPE_FLAGS)
-                tmp= av_get_int(v, o->name, NULL) | (int64_t)d;
-
-            av_set_number(v, o->name, tmp, 1, 1);
-            ret= o;
-        }
-    }
-    return ret;
-}
-
 static const double const_values[]={
     M_PI,
     M_E,
@@ -117,9 +99,6 @@ static int hexchar2int(char c) {
 
 const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){
     const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
-    if(o && o->offset==0 && o->type == FF_OPT_TYPE_CONST && o->unit){
-        return set_all_opt(obj, o->unit, o->default_val);
-    }
     if(!o || !val || o->offset<=0)
         return NULL;
     if(o->type == FF_OPT_TYPE_BINARY){