[FFmpeg-cvslog] r18856 - trunk/libavformat/oma.c

mru subversion
Sat May 16 17:09:31 CEST 2009


Author: mru
Date: Sat May 16 17:09:30 2009
New Revision: 18856

Log:
oma: fix build if memcmp() is a macro

Any C library function may be a macro, so compound literals
passed to memcmp() must be surrounded by parens to avoid being
split on commas.

Modified:
   trunk/libavformat/oma.c

Modified: trunk/libavformat/oma.c
==============================================================================
--- trunk/libavformat/oma.c	Sat May 16 16:17:08 2009	(r18855)
+++ trunk/libavformat/oma.c	Sat May 16 17:09:30 2009	(r18856)
@@ -89,7 +89,7 @@ static int oma_read_header(AVFormatConte
     if (ret != EA3_HEADER_SIZE)
         return -1;
 
-    if (memcmp(buf, (const uint8_t[]){'E', 'A', '3'},3) || buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
+    if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}),3) || buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
         av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n");
         return -1;
     }
@@ -177,7 +177,7 @@ static int oma_read_packet(AVFormatConte
 
 static int oma_read_probe(AVProbeData *p)
 {
-    if (!memcmp(p->buf, (const uint8_t[]){'e', 'a', '3', 3, 0},5))
+    if (!memcmp(p->buf, ((const uint8_t[]){'e', 'a', '3', 3, 0}),5))
         return AVPROBE_SCORE_MAX;
     else
         return 0;



More information about the ffmpeg-cvslog mailing list