# HG changeset patch
# User reimar
# Date 1185384694 0
# Node ID 27327c023b7e5ff880351c52897cc73646967399
# Parent  5fd33d4d5c3e67794caae2b75670ddcafa8ac7ad
Simplify: use FFMAX

diff -r 5fd33d4d5c3e -r 27327c023b7e libmpdemux/aviheader.c
--- a/libmpdemux/aviheader.c	Wed Jul 25 17:29:29 2007 +0000
+++ b/libmpdemux/aviheader.c	Wed Jul 25 17:31:34 2007 +0000
@@ -258,7 +258,7 @@
       break; }
     case ckidSTREAMFORMAT: {      // read 'strf'
       if(last_fccType==streamtypeVIDEO){
-        sh_video->bih=calloc((chunksize<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):chunksize,1);
+        sh_video->bih=calloc(FFMAX(chunksize, sizeof(BITMAPINFOHEADER)), 1);
 //        sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
         mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_FoundBitmapInfoHeader,chunksize,sizeof(BITMAPINFOHEADER));
         stream_read(demuxer->stream,(char*) sh_video->bih,chunksize);