Use FFMAX for slightly better readability.
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Sat, 11 Dec 2010 15:49:09 +0000 (15:49 +0000)
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Sat, 11 Dec 2010 15:49:09 +0000 (15:49 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@32687 b3059339-0415-0410-9bf9-f77b7e298cf2

libmpdemux/asfheader.c

index 8ba3e48..978c0d9 100644 (file)
@@ -345,7 +345,7 @@ static int asf_init_audio_stream(demuxer_t *demuxer,struct asf_priv* asf, sh_aud
   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;