summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-18 05:20:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-22 20:21:18 +0100
commit102b794e09482fec881e7ec903e57914895f9b74 (patch)
treeac46c2dcb072cf682392066789a472c0c97f96e0 /libavcodec
parent88956f73f29c9f066718b4c83bb628872990b879 (diff)
downloadffmpeg-streaming-102b794e09482fec881e7ec903e57914895f9b74.zip
ffmpeg-streaming-102b794e09482fec881e7ec903e57914895f9b74.tar.gz
configure: support raising major version in soname
this allows seperate installation of shared libs that should not conflict with whatever is already installed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 07947dd..b8a8d47 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -117,13 +117,19 @@ static int volatile entangled_thread_counter = 0;
static void *codec_mutex;
static void *avformat_mutex;
+#if CONFIG_RAISE_MAJOR
+# define LIBNAME "LIBAVCODEC_155"
+#else
+# define LIBNAME "LIBAVCODEC_55"
+#endif
+
#if FF_API_FAST_MALLOC && CONFIG_SHARED && HAVE_SYMVER
-FF_SYMVER(void*, av_fast_realloc, (void *ptr, unsigned int *size, size_t min_size), "LIBAVCODEC_55")
+FF_SYMVER(void*, av_fast_realloc, (void *ptr, unsigned int *size, size_t min_size), LIBNAME)
{
return av_fast_realloc(ptr, size, min_size);
}
-FF_SYMVER(void, av_fast_malloc, (void *ptr, unsigned int *size, size_t min_size), "LIBAVCODEC_55")
+FF_SYMVER(void, av_fast_malloc, (void *ptr, unsigned int *size, size_t min_size), LIBNAME)
{
av_fast_malloc(ptr, size, min_size);
}
OpenPOWER on IntegriCloud