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

1 files changed, 5 insertions, 5 deletions

diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c
index cd466d835d..3aa0c204e0 100644
--- a/libmpdemux/demux_vqf.c
+++ b/libmpdemux/demux_vqf.c
@@ -98,31 +98,31 @@ static demuxer_t* demux_open_vqf(demuxer_t* demuxer) {
         memcpy(sdata,&buf[i],slen); sdata[slen]=0; i+=slen;
         if(sid==mmioFOURCC('N','A','M','E'))
         {
-        memcpy(hi->Name,sdata,min(BUFSIZ,slen));
+        memcpy(hi->Name,sdata,FFMIN(BUFSIZ,slen));
         demux_info_add(demuxer,"Title",sdata);
         }
         else
         if(sid==mmioFOURCC('A','U','T','H'))
         {
-        memcpy(hi->Auth,sdata,min(BUFSIZ,slen));
+        memcpy(hi->Auth,sdata,FFMIN(BUFSIZ,slen));
         demux_info_add(demuxer,"Author",sdata);
         }
         else
         if(sid==mmioFOURCC('C','O','M','T'))
         {
-        memcpy(hi->Comt,sdata,min(BUFSIZ,slen));
+        memcpy(hi->Comt,sdata,FFMIN(BUFSIZ,slen));
         demux_info_add(demuxer,"Comment",sdata);
         }
         else
         if(sid==mmioFOURCC('(','c',')',' '))
         {
-        memcpy(hi->Cpyr,sdata,min(BUFSIZ,slen));
+        memcpy(hi->Cpyr,sdata,FFMIN(BUFSIZ,slen));
         demux_info_add(demuxer,"Copyright",sdata);
         }
         else
         if(sid==mmioFOURCC('F','I','L','E'))
         {
-        memcpy(hi->File,sdata,min(BUFSIZ,slen));
+        memcpy(hi->File,sdata,FFMIN(BUFSIZ,slen));
         }
         else
         if(sid==mmioFOURCC('A','L','B','M')) demux_info_add(demuxer,"Album",sdata);