Mercurial > mplayer.hg

changeset 27243:e0641ed3cefd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
100l, do not use macros on functions that are not idempotent
author reimar
date Sun, 13 Jul 2008 16:56:00 +0000
parents e14f95ec3b57
children a25810edd65a
files libmpdemux/demux_audio.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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",