diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-25 17:31:34 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-25 17:31:34 +0000 |
| commit | 7cd6c01aca63fc341f4746427e6a59949d9dd986 (patch) | |
| tree | 690a4f5a70a8c94864b3ddd53876fc04ca3ac8b8 /libmpdemux | |
| parent | d02f928bc30ed75ef4017346f47e768b248cb575 (diff) | |
| download | mpv-7cd6c01aca63fc341f4746427e6a59949d9dd986.tar.bz2 mpv-7cd6c01aca63fc341f4746427e6a59949d9dd986.tar.xz | |
Simplify: use FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23861 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/aviheader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 063c478283..aa31363c82 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -258,7 +258,7 @@ while(1){ 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); |