From 838dc131f1d6f1892878de372c7e2ea75fc205d3 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Thu, 30 Sep 2010 20:34:35 +0000
Subject: add FF_API_SET_STRING_OLD define to disable the deprecated
 av_set_string API

Originally committed as revision 25276 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/avcodec.h | 3 +++
 libavcodec/opt.c     | 2 +-
 libavcodec/opt.h     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'libavcodec')

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f4b2569d11..781cd298bf 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -69,6 +69,9 @@
 #ifndef FF_API_USE_LPC
 #define FF_API_USE_LPC          (LIBAVCODEC_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_SET_STRING_OLD
+#define FF_API_SET_STRING_OLD   (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
 
 #define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
 #define AV_TIME_BASE            1000000
diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index fed9ae9930..ffa422ec93 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -65,7 +65,7 @@ FF_SYMVER(void, av_opt_set_defaults2, (void *s, int mask, int flags), "LIBAVCODE
 }
 #endif
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
+#if FF_API_SET_STRING_OLD
 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)
diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index b6e6f59ea4..95147595b7 100644
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -31,7 +31,7 @@
 #include "avcodec.h"
 #include "libavutil/opt.h"
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
+#if FF_API_SET_STRING_OLD
 /**
  * @see av_set_string2()
  */
-- 
cgit v1.2.3