Mercurial > mplayer.hg

diff libmpcodecs/vd_ffmpeg.c @ 21531:a90aa203186c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of min/max macros from aviheader.h, they do not belong here. Replace their uses by FFMIN/FFMAX
author reimar
date Sat, 09 Dec 2006 12:24:11 +0000
parents fa99b3d31d13
children ea78a2b99651
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c	Sat Dec 09 12:14:14 2006 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sat Dec 09 12:24:11 2006 +0000
@@ -392,11 +392,11 @@
         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)