# HG changeset patch
# User reimar
# Date 1292082549 0
# Node ID f418c82bd5029b7d28917470547443abe43d58ac
# Parent  b8afc497ccd378f9c5986b234bf95f88ff01df3d
Use FFMAX for slightly better readability.

diff -r b8afc497ccd3 -r f418c82bd502 libmpdemux/asfheader.c
--- 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;