1 files changed, 37 insertions, 39 deletions

diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c
index a520597972..410bb79b81 100644
--- a/apps/metadata/mp4.c
+++ b/apps/metadata/mp4.c
@@ -33,45 +33,43 @@
 #include "debug.h"
 #include "replaygain.h"
 
-#define MP4_ID(a, b, c, d)  (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
-
-#define MP4_3gp6 MP4_ID('3', 'g', 'p', '6')
-#define MP4_aART MP4_ID('a', 'A', 'R', 'T')
-#define MP4_alac MP4_ID('a', 'l', 'a', 'c')
-#define MP4_calb MP4_ID(0xa9, 'a', 'l', 'b')
-#define MP4_cART MP4_ID(0xa9, 'A', 'R', 'T')
-#define MP4_cgrp MP4_ID(0xa9, 'g', 'r', 'p')
-#define MP4_cgen MP4_ID(0xa9, 'g', 'e', 'n')
-#define MP4_chpl MP4_ID('c', 'h', 'p', 'l')
-#define MP4_cnam MP4_ID(0xa9, 'n', 'a', 'm')
-#define MP4_cwrt MP4_ID(0xa9, 'w', 'r', 't')
-#define MP4_ccmt MP4_ID(0xa9, 'c', 'm', 't')
-#define MP4_cday MP4_ID(0xa9, 'd', 'a', 'y')
-#define MP4_disk MP4_ID('d', 'i', 's', 'k')
-#define MP4_esds MP4_ID('e', 's', 'd', 's')
-#define MP4_ftyp MP4_ID('f', 't', 'y', 'p')
-#define MP4_gnre MP4_ID('g', 'n', 'r', 'e')
-#define MP4_hdlr MP4_ID('h', 'd', 'l', 'r')
-#define MP4_ilst MP4_ID('i', 'l', 's', 't')
-#define MP4_M4A  MP4_ID('M', '4', 'A', ' ')
-#define MP4_M4B  MP4_ID('M', '4', 'B', ' ')
-#define MP4_mdat MP4_ID('m', 'd', 'a', 't')
-#define MP4_mdia MP4_ID('m', 'd', 'i', 'a')
-#define MP4_mdir MP4_ID('m', 'd', 'i', 'r')
-#define MP4_meta MP4_ID('m', 'e', 't', 'a')
-#define MP4_minf MP4_ID('m', 'i', 'n', 'f')
-#define MP4_moov MP4_ID('m', 'o', 'o', 'v')
-#define MP4_mp4a MP4_ID('m', 'p', '4', 'a')
-#define MP4_mp42 MP4_ID('m', 'p', '4', '2')
-#define MP4_qt   MP4_ID('q', 't', ' ', ' ')
-#define MP4_soun MP4_ID('s', 'o', 'u', 'n')
-#define MP4_stbl MP4_ID('s', 't', 'b', 'l')
-#define MP4_stsd MP4_ID('s', 't', 's', 'd')
-#define MP4_stts MP4_ID('s', 't', 't', 's')
-#define MP4_trak MP4_ID('t', 'r', 'a', 'k')
-#define MP4_trkn MP4_ID('t', 'r', 'k', 'n')
-#define MP4_udta MP4_ID('u', 'd', 't', 'a')
-#define MP4_extra MP4_ID('-', '-', '-', '-')
+#define MP4_3gp6 FOURCC('3', 'g', 'p', '6')
+#define MP4_aART FOURCC('a', 'A', 'R', 'T')
+#define MP4_alac FOURCC('a', 'l', 'a', 'c')
+#define MP4_calb FOURCC(0xa9, 'a', 'l', 'b')
+#define MP4_cART FOURCC(0xa9, 'A', 'R', 'T')
+#define MP4_cgrp FOURCC(0xa9, 'g', 'r', 'p')
+#define MP4_cgen FOURCC(0xa9, 'g', 'e', 'n')
+#define MP4_chpl FOURCC('c', 'h', 'p', 'l')
+#define MP4_cnam FOURCC(0xa9, 'n', 'a', 'm')
+#define MP4_cwrt FOURCC(0xa9, 'w', 'r', 't')
+#define MP4_ccmt FOURCC(0xa9, 'c', 'm', 't')
+#define MP4_cday FOURCC(0xa9, 'd', 'a', 'y')
+#define MP4_disk FOURCC('d', 'i', 's', 'k')
+#define MP4_esds FOURCC('e', 's', 'd', 's')
+#define MP4_ftyp FOURCC('f', 't', 'y', 'p')
+#define MP4_gnre FOURCC('g', 'n', 'r', 'e')
+#define MP4_hdlr FOURCC('h', 'd', 'l', 'r')
+#define MP4_ilst FOURCC('i', 'l', 's', 't')
+#define MP4_M4A  FOURCC('M', '4', 'A', ' ')
+#define MP4_M4B  FOURCC('M', '4', 'B', ' ')
+#define MP4_mdat FOURCC('m', 'd', 'a', 't')
+#define MP4_mdia FOURCC('m', 'd', 'i', 'a')
+#define MP4_mdir FOURCC('m', 'd', 'i', 'r')
+#define MP4_meta FOURCC('m', 'e', 't', 'a')
+#define MP4_minf FOURCC('m', 'i', 'n', 'f')
+#define MP4_moov FOURCC('m', 'o', 'o', 'v')
+#define MP4_mp4a FOURCC('m', 'p', '4', 'a')
+#define MP4_mp42 FOURCC('m', 'p', '4', '2')
+#define MP4_qt   FOURCC('q', 't', ' ', ' ')
+#define MP4_soun FOURCC('s', 'o', 'u', 'n')
+#define MP4_stbl FOURCC('s', 't', 'b', 'l')
+#define MP4_stsd FOURCC('s', 't', 's', 'd')
+#define MP4_stts FOURCC('s', 't', 't', 's')
+#define MP4_trak FOURCC('t', 'r', 'a', 'k')
+#define MP4_trkn FOURCC('t', 'r', 'k', 'n')
+#define MP4_udta FOURCC('u', 'd', 't', 'a')
+#define MP4_extra FOURCC('-', '-', '-', '-')
 
 /* Read the tag data from an MP4 file, storing up to buffer_size bytes in
  * buffer.