Changeset 0a60a95fed8919588e440b5b4b5786449a79151f

Timestamp:

18/08/07 16:44:47 (1 year ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1187448287 +0000

git-parent:

[2dd551cb0f3b48228f499bc4024063d88bb05457]

git-author:

Rafaël Carré <funman@videolan.org> 1187448287 +0000

Message:

Disables meta reading in vorbis codec when taglib plugin is being built

Files:

• configure.ac (modified) (1 diff)
• modules/codec/vorbis.c (modified) (4 diffs)

configure.ac

@@ -1728 +1728 @@
-  AS_IF([test "${enable_taglib}" != "no"],[
-    PKG_CHECK_MODULES(TAGLIB, taglib,
-
+
+
-        VLC_ADD_LDFLAGS([taglib],[$TAGLIB_LIBS -lz])
-       VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ],

modules/codec/vorbis.c

@@ -137 +137 @@
-static block_t *SendPacket( decoder_t *, ogg_packet *, block_t * );
-
+#ifndef HAVE_TAGLIB
-static void ParseVorbisComments( decoder_t * );
+#endif
-
-static void ConfigureChannelOrder(int *, int, uint32_t, vlc_bool_t );
@@ -433 +435 @@
-        return VLC_EGENERIC;
-    }
+#ifndef HAVE_TAGLIB
-    ParseVorbisComments( p_dec );
+#endif
-
-    /* The next packet in order is the codebooks header
@@ -606 +610 @@
-}
-
-
-
+
+
+
- *****************************************************************************/
-static void ParseVorbisComments( decoder_t *p_dec )
@@ -723 +728 @@
-    }
-}
+#endif
-
-/*****************************************************************************