From 13728334e8ac3dde15ef23a6a4aa935b3c92fa64 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Fri, 15 Oct 2010 18:25:01 +0000 Subject: [PATCH] add FF_API_SYMVER define to disable symver compatibility functions Originally committed as revision 25491 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avformat.h | 3 +++ libavformat/utils.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 0ab115688..2b7d16697 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -81,6 +81,9 @@ #ifndef FF_API_FIRST_FORMAT #define FF_API_FIRST_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53) #endif +#ifndef FF_API_SYMVER +#define FF_API_SYMVER (LIBAVFORMAT_VERSION_MAJOR < 53) +#endif /** * I return the LIBAVFORMAT_VERSION_INT constant. You got diff --git a/libavformat/utils.c b/libavformat/utils.c index be475cce7..289b91ca7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -290,7 +290,7 @@ AVInputFormat *av_find_input_format(const char *short_name) return NULL; } -#if LIBAVFORMAT_VERSION_MAJOR < 53 && CONFIG_SHARED && HAVE_SYMVER +#if FF_API_SYMVER && CONFIG_SHARED && HAVE_SYMVER FF_SYMVER(void, av_destruct_packet_nofree, (AVPacket *pkt), "LIBAVFORMAT_52") { av_destruct_packet_nofree(pkt); -- 2.11.0