From: Anton Khirnov Date: Thu, 3 Feb 2011 11:49:12 +0000 (+0100) Subject: lavf: remove FF_API_SYMVER cruft X-Git-Tag: n0.8~523^2~221 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/5763e63913940f8d2d2eb8750931e5f12dd2a481 lavf: remove FF_API_SYMVER cruft --- diff --git a/libavformat/utils.c b/libavformat/utils.c index 1359bd3..1e70b4f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -260,38 +260,6 @@ AVInputFormat *av_find_input_format(const char *short_name) return NULL; } -#if FF_API_SYMVER && CONFIG_SHARED && HAVE_SYMVER -FF_SYMVER(void, av_destruct_packet_nofree, (AVPacket *pkt), "LIBAVFORMAT_52") -{ - av_destruct_packet_nofree(pkt); -} - -FF_SYMVER(void, av_destruct_packet, (AVPacket *pkt), "LIBAVFORMAT_52") -{ - av_destruct_packet(pkt); -} - -FF_SYMVER(int, av_new_packet, (AVPacket *pkt, int size), "LIBAVFORMAT_52") -{ - return av_new_packet(pkt, size); -} - -FF_SYMVER(int, av_dup_packet, (AVPacket *pkt), "LIBAVFORMAT_52") -{ - return av_dup_packet(pkt); -} - -FF_SYMVER(void, av_free_packet, (AVPacket *pkt), "LIBAVFORMAT_52") -{ - av_free_packet(pkt); -} - -FF_SYMVER(void, av_init_packet, (AVPacket *pkt), "LIBAVFORMAT_52") -{ - av_log(NULL, AV_LOG_WARNING, "Diverting av_*_packet function calls to libavcodec. Recompile to improve performance\n"); - av_init_packet(pkt); -} -#endif int av_get_packet(AVIOContext *s, AVPacket *pkt, int size) { diff --git a/libavformat/version.h b/libavformat/version.h index 9499fd6..735891a 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -50,9 +50,6 @@ #ifndef FF_API_READ_SEEK #define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54) #endif -#ifndef FF_API_SYMVER -#define FF_API_SYMVER (LIBAVFORMAT_VERSION_MAJOR < 53) -#endif #ifndef FF_API_OLD_AVIO #define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 54) #endif