aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux
diff options
context:
space:
mode:
authorGravatar reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-13 16:56:00 +0000
committerGravatar reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-13 16:56:00 +0000
commit468f0e9763b3cc8d191a63a714594f89f59050c5 (patch)
treeb98207edb376960daeab399f81f36c5f5c374ed0 /libmpdemux
parent414178967f2b952a85491728d59f8dee2efc84fc (diff)
100l, do not use macros on functions that are not idempotent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27275 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_audio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index ebaf4e4c3c..99691ecef0 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -391,7 +391,8 @@ static int demux_audio_open(demuxer_t* demuxer) {
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",