# HG changeset patch # User reimar # Date 1215968160 0 # Node ID e0641ed3cefdc4de5daefb63d8bea7230919f1ef # Parent e14f95ec3b575033aa966fd4e2dcd965f25aaf71 100l, do not use macros on functions that are not idempotent diff -r e14f95ec3b57 -r e0641ed3cefd libmpdemux/demux_audio.c --- a/libmpdemux/demux_audio.c Sun Jul 13 14:36:20 2008 +0000 +++ b/libmpdemux/demux_audio.c Sun Jul 13 16:56:00 2008 +0000 @@ -391,7 +391,8 @@ 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",