[FFmpeg-cvslog] r23612 - in branches/0.6: configure libavformat/utils.c

[siretart]

Author: siretart
Date: Tue Jun 15 15:29:20 2010
New Revision: 23612

Log:
revert r23610, better patch is pending

Modified:
   branches/0.6/configure
   branches/0.6/libavformat/utils.c

Modified: branches/0.6/configure
==============================================================================
--- branches/0.6/configure	Tue Jun 15 15:26:52 2010	(r23611)
+++ branches/0.6/configure	Tue Jun 15 15:29:20 2010	(r23612)
@@ -1086,7 +1086,6 @@ HAVE_LIST="
     struct_sockaddr_in6
     struct_sockaddr_sa_len
     struct_sockaddr_storage
-    gnu_symbol_versioning
     sys_mman_h
     sys_resource_h
     sys_select_h
@@ -2734,12 +2733,7 @@ check_ldflags -Wl,-Bsymbolic
 
 echo "X{};" > $TMPV
 test_ldflags -Wl,--version-script,$TMPV &&
-    append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver' &&
-    check_cc <<EOF && enable gnu_symbol_versioning
-int ff_foo();
-int ff_foo() {}
-__asm__(".symver foo,av_foo at SOME_TAG");
-EOF
+    append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
 
 if enabled small; then
     add_cflags $size_cflags

Modified: branches/0.6/libavformat/utils.c
==============================================================================
--- branches/0.6/libavformat/utils.c	Tue Jun 15 15:26:52 2010	(r23611)
+++ branches/0.6/libavformat/utils.c	Tue Jun 15 15:29:20 2010	(r23612)
@@ -282,54 +282,8 @@ AVInputFormat *av_find_input_format(cons
     return NULL;
 }
 
-#if HAVE_GNU_SYMBOL_VERSIONING && LIBAVFORMAT_VERSION_MAJOR < 53
-/* compatibility trampolines for packet functions */
-
-void ff_av_destruct_packet_nofree(AVPacket *pkt);
-void ff_av_destruct_packet(AVPacket *pkt);
-int ff_av_new_packet(AVPacket *pkt, int size);
-int ff_av_dup_packet(AVPacket *pkt);
-void ff_av_free_packet(AVPacket *pkt);
-void ff_av_init_packet(AVPacket *pkt);
-
-__asm__(".symver ff_av_destruct_packet_nofree,av_destruct_packet_nofree at LIBAVFORMAT_52");
-__asm__(".symver ff_av_destruct_packet,av_destruct_packet at LIBAVFORMAT_52");
-__asm__(".symver ff_av_new_packet,av_new_packet at LIBAVFORMAT_52");
-__asm__(".symver ff_av_dup_packet,av_dup_packet at LIBAVFORMAT_52");
-__asm__(".symver ff_av_free_packet,av_free_packet at LIBAVFORMAT_52");
-__asm__(".symver ff_av_init_packet,av_init_packet at LIBAVFORMAT_52");
-
-void ff_av_destruct_packet_nofree(AVPacket *pkt)
-{
-    av_destruct_packet_nofree(pkt);
-}
-
-void ff_av_destruct_packet(AVPacket *pkt)
-{
-    av_destruct_packet(pkt);
-}
-
-int ff_av_new_packet(AVPacket *pkt, int size)
-{
-    return av_new_packet(pkt, size);
-}
-
-int ff_av_dup_packet(AVPacket *pkt)
-{
-    return av_dup_packet(pkt);
-}
-
-void ff_av_free_packet(AVPacket *pkt)
-{
-    av_free_packet(pkt);
-}
+/* memory handling */
 
-void ff_av_init_packet(AVPacket *pkt)
-{
-    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(ByteIOContext *s, AVPacket *pkt, int size)
 {