[MPlayer-cvslog] r32687 - trunk/libmpdemux/asfheader.c

[reimar]

Author: reimar
Date: Sat Dec 11 16:49:09 2010
New Revision: 32687

Log:
Use FFMAX for slightly better readability.

Modified:
   trunk/libmpdemux/asfheader.c

Modified: trunk/libmpdemux/asfheader.c
==============================================================================
--- trunk/libmpdemux/asfheader.c	Sat Dec 11 16:46:30 2010	(r32686)
+++ trunk/libmpdemux/asfheader.c	Sat Dec 11 16:49:09 2010	(r32687)
@@ -345,7 +345,7 @@ static int asf_init_audio_stream(demuxer
   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;