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 /libmpdemux/demux_ogg.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 'libmpdemux/demux_ogg.c')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |