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_mpg.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_mpg.c')
| -rw-r--r-- | libmpdemux/demux_mpg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 9e18ff13e1..e02ca0a768 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -57,7 +57,7 @@ static int parse_psm(demuxer_t *demux, int len) { prog_len = stream_read_word(demux->stream); //length of program descriptors stream_skip(demux->stream, prog_len); //.. that we ignore es_map_len = stream_read_word(demux->stream); //length of elementary streams map - es_map_len = min(es_map_len, len - prog_len - 8); //sanity check + es_map_len = FFMIN(es_map_len, len - prog_len - 8); //sanity check while(es_map_len > 0) { type = stream_read_char(demux->stream); id = stream_read_char(demux->stream); @@ -91,7 +91,7 @@ static int parse_psm(demuxer_t *demux, int len) { mp_dbg(MSGT_DEMUX,MSGL_V, "PSM ES, id=0x%x, type=%x, stype: %x\n", id, type, priv->es_map[idoffset]); } plen = stream_read_word(demux->stream); //length of elementary stream descriptors - plen = min(plen, es_map_len); //sanity check + plen = FFMIN(plen, es_map_len); //sanity check stream_skip(demux->stream, plen); //skip descriptors for now es_map_len -= 4 + plen; } |