diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-09 12:24:11 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-09 12:24:11 +0000 |
commit | 6caf5586eeb00b45190ceaeff270e6850598e87c (patch) | |
tree | 2102ee89551ec703f7171ca72dfd0649dc7a358f /libmpcodecs/vd_ffmpeg.c | |
parent | 134a537a76e429b16b8069e60d51ddbd4d6a0494 (diff) | |
download | mpv-6caf5586eeb00b45190ceaeff270e6850598e87c.tar.bz2 mpv-6caf5586eeb00b45190ceaeff270e6850598e87c.tar.xz |
Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 41fc206c20..9ee80680e5 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -392,11 +392,11 @@ static int init(sh_video_t *sh){ if (sh->bih->biSize-sizeof(BITMAPINFOHEADER)) /* Palette size in biSize */ memcpy(avctx->palctrl->palette, sh->bih+1, - min(sh->bih->biSize-sizeof(BITMAPINFOHEADER), AVPALETTE_SIZE)); + FFMIN(sh->bih->biSize-sizeof(BITMAPINFOHEADER), AVPALETTE_SIZE)); else /* Palette size in biClrUsed */ memcpy(avctx->palctrl->palette, sh->bih+1, - min(sh->bih->biClrUsed * 4, AVPALETTE_SIZE)); + FFMIN(sh->bih->biClrUsed * 4, AVPALETTE_SIZE)); } if(sh->bih) |