From 6caf5586eeb00b45190ceaeff270e6850598e87c Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 9 Dec 2006 12:24:11 +0000 Subject: 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 --- libmpdemux/demux_ogg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux/demux_ogg.c') diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index b3bac3ff12..14703f3b94 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -593,7 +593,7 @@ void demux_ogg_scan_stream(demuxer_t* demuxer) { 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); -- cgit v1.2.3