Mercurial > mplayer.hg
changeset 29892:ecf6cbab0b8d
Silence two gcc warnings: suggest parentheses around && within ||
| author | cehoyos |
|---|---|
| date | Wed, 18 Nov 2009 18:24:05 +0000 |
| parents | eac5c6780b8d |
| children | 5eef60a98c6f |
| files | libmpdemux/demux_rtp_codec.cpp |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_rtp_codec.cpp Wed Nov 18 18:07:54 2009 +0000 +++ b/libmpdemux/demux_rtp_codec.cpp Wed Nov 18 18:24:05 2009 +0000 @@ -191,9 +191,9 @@ 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);