[MPlayer-cvslog] r29934 - trunk/libmpdemux/demux_rtp_codec.cpp

[cehoyos]

Author: cehoyos
Date: Wed Nov 18 19:24:05 2009
New Revision: 29934

Log:
Silence two gcc warnings: suggest parentheses around && within ||

Modified:
   trunk/libmpdemux/demux_rtp_codec.cpp

Modified: trunk/libmpdemux/demux_rtp_codec.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp_codec.cpp	Wed Nov 18 19:07:54 2009	(r29933)
+++ trunk/libmpdemux/demux_rtp_codec.cpp	Wed Nov 18 19:24:05 2009	(r29934)
@@ -191,9 +191,9 @@ void rtpCodecInitialize_video(demuxer_t*
       while (pos+8 < endpos) {
         unsigned atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3];
         if (atomLength == 0 || atomLength > endpos-pos) break;
-        if ((!memcmp(pos+4, "avcC", 4) && fourcc==mmioFOURCC('a','v','c','1') ||
+        if (((!memcmp(pos+4, "avcC", 4) && fourcc==mmioFOURCC('a','v','c','1')) ||
              !memcmp(pos+4, "esds", 4) ||
-             !memcmp(pos+4, "SMI ", 4) && fourcc==mmioFOURCC('S','V','Q','3')) &&
+             (!memcmp(pos+4, "SMI ", 4) && fourcc==mmioFOURCC('S','V','Q','3'))) &&
             atomLength > 8) {
           sh_video->bih = bih =
               insertVideoExtradata(bih, pos+8, atomLength-8);