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/muxer_mpeg.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/muxer_mpeg.c')
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 755d4c5ecd..d399a7864c 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -936,7 +936,7 @@ static int calc_packet_len(muxer_stream_t *s, int psize, int finalize) { if(!frpos && len>0 && s->type == MUXER_TYPE_VIDEO && spriv->framebuf[n].type==I_FRAME) return len; - m = min(spriv->framebuf[n].size - frpos, psize - len); + m = FFMIN(spriv->framebuf[n].size - frpos, psize - len); len += m; frpos += m; if(frpos == spriv->framebuf[n].size) @@ -997,8 +997,8 @@ static int find_packet_timestamps(muxer_priv_t *priv, muxer_stream_t *s, unsigne if(i > -1) { - dpts = max(spriv->last_saved_pts, spriv->framebuf[i].pts) - - min(spriv->last_saved_pts, spriv->framebuf[i].pts) + + dpts = FFMAX(spriv->last_saved_pts, spriv->framebuf[i].pts) - + FFMIN(spriv->last_saved_pts, spriv->framebuf[i].pts) + spriv->framebuf[0].idur; if(s->type != MUXER_TYPE_VIDEO) @@ -1218,7 +1218,7 @@ static int fill_packet(muxer_t *muxer, muxer_stream_t *s, int finalize) update_demux_bufsize(spriv, frm->dts, frm->size, s->type); } - m = min(frm->size - frm->pos, priv->packet_size - spriv->pack_offset); + m = FFMIN(frm->size - frm->pos, priv->packet_size - spriv->pack_offset); memcpy(&(spriv->pack[spriv->pack_offset]), &(frm->buffer[frm->pos]), m); len += m; @@ -2215,7 +2215,7 @@ static void fix_parameters(muxer_stream_t *stream) { stream->ckid = be2me_32 (0x1bd); if(priv->is_genmpeg1 || priv->is_genmpeg2) - fix_audio_sys_header(priv, spriv->id, 0xbd, max(conf_abuf_size, 58)*1024); //only one audio at the moment + fix_audio_sys_header(priv, spriv->id, 0xbd, FFMAX(conf_abuf_size, 58)*1024); //only one audio at the moment spriv->id = 0xbd; if(!conf_abuf_size) spriv->max_buffer_size = 16*1024; |