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.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16243 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 1c0bb6c7a8310c2371489667d7f8ec5c20b41dd3..78fbfaeb5793fbaeb528bfc25691b3398e383e90 100644 (file)
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -199,6 +199,7 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons
     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, const char *name, const char *val){
         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);

diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index c3e716ba961e3d46987c8ae0ea06439a33d4cf64..c96893055bcd8c54e0e96829796157a8f41d8425 100644 (file)
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -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_set_string(void *obj, const char *name,
  * @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.