Mercurial > mplayer.hg

diff libmpdemux/demux_ogg.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 06d8fa9450b7
children ff1d5576063f
line wrap: on
line diff
--- a/libmpdemux/demux_ogg.c	Sat Dec 09 12:14:14 2006 +0000
+++ b/libmpdemux/demux_ogg.c	Sat Dec 09 12:24:11 2006 +0000
@@ -593,7 +593,7 @@
   stream_seek(s,demuxer->movi_start);
   } else {
     //the 270000 are just a wild guess
-    stream_seek(s,max(ogg_d->pos,demuxer->movi_end-270000));
+    stream_seek(s,FFMAX(ogg_d->pos,demuxer->movi_end-270000));
   }
   ogg_sync_reset(sync);