summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-10-15 18:25:01 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-10-15 18:25:01 +0000
commit13728334e8ac3dde15ef23a6a4aa935b3c92fa64 (patch)
tree188851e992b4d3b01a0c7f38c12a0d29fbb3aea9 /libavformat
parentad2d0fdf2519a413e8194d8cd641a230c612abc3 (diff)
downloadffmpeg-streaming-13728334e8ac3dde15ef23a6a4aa935b3c92fa64.zip
ffmpeg-streaming-13728334e8ac3dde15ef23a6a4aa935b3c92fa64.tar.gz
add FF_API_SYMVER define to disable symver compatibility functions
Originally committed as revision 25491 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h3
-rw-r--r--libavformat/utils.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 0ab1156..2b7d166 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 be475cc..289b91c 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);
OpenPOWER on IntegriCloud