Mercurial > mplayer.hg

changeset 32600:f418c82bd502

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use FFMAX for slightly better readability.
author reimar
date Sat, 11 Dec 2010 15:49:09 +0000
parents b8afc497ccd3
children f23e289e35c6
files libmpdemux/asfheader.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/asfheader.c	Sat Dec 11 15:46:30 2010 +0000
+++ b/libmpdemux/asfheader.c	Sat Dec 11 15:49:09 2010 +0000
@@ -345,7 +345,7 @@
   uint8_t *buffer = *buf;
   int pos = *ppos;
 
-  sh_audio->wf=calloc((streamh->type_size<sizeof(*sh_audio->wf))?sizeof(*sh_audio->wf):streamh->type_size,1);
+  sh_audio->wf=calloc(FFMAX(streamh->type_size, sizeof(*sh_audio->wf)), 1);
   memcpy(sh_audio->wf,buffer,streamh->type_size);
   le2me_WAVEFORMATEX(sh_audio->wf);
   sh_audio->format=sh_audio->wf->wFormatTag;