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

[stefano]

Author: stefano
Date: Fri Dec 19 23:37:56 2008
New Revision: 16243

Log:
Put under #if LIBAVCODEC_VERSION_MAJOR < 53 the deprecated functions
av_set_string() and av_set_string2(), they will be dropped at the next
major bump.


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

Modified: trunk/libavcodec/opt.c
==============================================================================
--- trunk/libavcodec/opt.c	(original)
+++ trunk/libavcodec/opt.c	Fri Dec 19 23:37:56 2008
@@ -199,6 +199,7 @@ int av_set_string3(void *obj, const char
     return 0;
 }
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){
     const AVOption *o;
     if (av_set_string3(obj, name, val, alloc, &o) < 0)
@@ -212,6 +213,7 @@ const AVOption *av_set_string(void *obj,
         return NULL;
     return o;
 }
+#endif
 
 const AVOption *av_set_double(void *obj, const char *name, double n){
     return av_set_number(obj, name, n, 1, 1);

Modified: trunk/libavcodec/opt.h
==============================================================================
--- trunk/libavcodec/opt.h	(original)
+++ trunk/libavcodec/opt.h	Fri Dec 19 23:37:56 2008
@@ -99,6 +99,7 @@ typedef struct AVOption {
  */
 const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags);
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
  * @see av_set_string2()
  */
@@ -111,6 +112,7 @@ attribute_deprecated const AVOption *av_
  * @see av_set_string3()
  */
 attribute_deprecated const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc);
+#endif
 
 /**
  * Sets the field of obj with the given name to value.