diff -udr kid3-2.0.1.orig/src/core/formats/m4afile.cpp kid3-2.0.1/src/core/formats/m4afile.cpp
--- kid3-2.0.1.orig/src/core/formats/m4afile.cpp	2011-10-31 11:10:11.000000000 +0600
+++ kid3-2.0.1/src/core/formats/m4afile.cpp	2012-03-28 04:15:43.696741851 +0600
@@ -240,7 +240,9 @@
   return Frame::FT_UnknownFrame;
 }
 
-#ifndef HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG
+#if MPEG4IP_MAJOR_MINOR_VERSION >= 0x0109
+#elif defined HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG
+#else
 /**
  * Check if a name is a free form field.
  *
@@ -649,7 +651,7 @@
             MP4TagsSetCompilation(tags, &cpl);
           } else if (name == "covr") {
             MP4TagArtwork artwork;
-            artwork.data = value.data();
+            artwork.data = (void *)value.data();
             artwork.size = value.size();
             artwork.type = MP4_ART_UNDEFINED;
             MP4TagsAddArtwork(tags, &artwork);
@@ -722,16 +724,16 @@
             MP4TagsSetITunesCountry(tags, &val);
           } else if (name == "cnID") {
             uint32_t val = str.toULong();
-            MP4TagsSetCNID(tags, &val);
+            MP4TagsSetContentID(tags, &val);
           } else if (name == "atID") {
             uint32_t val = str.toULong();
-            MP4TagsSetATID(tags, &val);
+            MP4TagsSetArtistID(tags, &val);
           } else if (name == "plID") {
             uint64_t val = str.toULongLong();
-            MP4TagsSetPLID(tags, &val);
+            MP4TagsSetPlaylistID(tags, &val);
           } else if (name == "geID") {
             uint32_t val = str.toULong();
-            MP4TagsSetGEID(tags, &val);
+            MP4TagsSetGenreID(tags, &val);
           } else {
             MP4ItmfItem* item = MP4ItmfItemAlloc("----", 1);
             item->mean = strdup("com.apple.iTunes");