[MPlayer-cvslog] r27275 - trunk/libmpdemux/demux_audio.c

[reimar]

Author: reimar
Date: Sun Jul 13 18:56:00 2008
New Revision: 27275

Log:
100l, do not use macros on functions that are not idempotent


Modified:
   trunk/libmpdemux/demux_audio.c

Modified: trunk/libmpdemux/demux_audio.c
==============================================================================
--- trunk/libmpdemux/demux_audio.c	(original)
+++ trunk/libmpdemux/demux_audio.c	Sun Jul 13 18:56:00 2008
@@ -391,7 +391,8 @@ static int demux_audio_open(demuxer_t* d
     sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec;
     l -= 16;
     if (l >= 2) {
-      w->cbSize = FFMAX(stream_read_word_le(s), 0);
+      w->cbSize = stream_read_word_le(s);
+      if (w->cbSize < 0) w->cbSize = 0;
       l -= 2;
       if (l < w->cbSize) {
         mp_msg(MSGT_DEMUX,MSGL_ERR,"[demux_audio] truncated extradata (%d < %d)\n",