commit d6940cc1ed8bdf51de2ae4305d3d25cdfc4073c6
Merge: d452908 6d5a2e5
Author: phantomjinx <[email protected]>
Date: Mon May 3 13:21:17 2010 +0100
Merge remote branch 'origin/master' into plugin-framework
configure.in | 2 +-
po/ca.po | 5830 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/mp4file.c | 6 +
3 files changed, 5837 insertions(+), 1 deletions(-)
---
diff --cc src/mp4file.c
index 8f74c3d,7a6d370..60d2549
--- a/src/mp4file.c
+++ b/src/mp4file.c
@@@ -438,9 -443,10 +443,10 @@@ void mp4_init(
MP4TagsAllocFunc = (MP4TagsAlloc_t) dlsym(mp4v2_handle, "MP4TagsAlloc");
MP4TagsFetchFunc = (MP4TagsFetch_t) dlsym(mp4v2_handle, "MP4TagsFetch");
MP4TagsFreeFunc = (MP4TagsFree_t) dlsym(mp4v2_handle, "MP4TagsFree");
+ #endif
/* alternate names for HAVE_LIBMP4V2_2 */
-
+
if(!MP4GetMetadataWriter)
{
MP4GetMetadataWriter = (MP4GetMetadataWriter_t) dlsym(mp4v2_handle,
"MP4GetMetadataComposer");
------------------------------------------------------------------------------
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
