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 /libmpcodecs | |
| 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 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_hwmpa.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ae_pcm.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/ve_x264.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/ad_hwmpa.c b/libmpcodecs/ad_hwmpa.c index 6f25bcef57..3b9bdedc8c 100644 --- a/libmpcodecs/ad_hwmpa.c +++ b/libmpcodecs/ad_hwmpa.c @@ -96,7 +96,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) if(start + len > sh->a_in_buffer_len) { int l; - l = min(sh->a_in_buffer_size - sh->a_in_buffer_len, start + len); + l = FFMIN(sh->a_in_buffer_size - sh->a_in_buffer_len, start + len); l = demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len], l); if(! l) break; diff --git a/libmpcodecs/ae_pcm.c b/libmpcodecs/ae_pcm.c index c862b3ed57..02fd04cec7 100644 --- a/libmpcodecs/ae_pcm.c +++ b/libmpcodecs/ae_pcm.c @@ -36,7 +36,7 @@ static int bind_pcm(audio_encoder_t *encoder, muxer_stream_t *mux_a) static int encode_pcm(audio_encoder_t *encoder, uint8_t *dest, void *src, int nsamples, int max_size) { - max_size = min(nsamples, max_size); + max_size = FFMIN(nsamples, max_size); memcpy(dest, src, max_size); return max_size; } diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 41fc206c20..9ee80680e5 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -392,11 +392,11 @@ static int init(sh_video_t *sh){ if (sh->bih->biSize-sizeof(BITMAPINFOHEADER)) /* Palette size in biSize */ memcpy(avctx->palctrl->palette, sh->bih+1, - min(sh->bih->biSize-sizeof(BITMAPINFOHEADER), AVPALETTE_SIZE)); + FFMIN(sh->bih->biSize-sizeof(BITMAPINFOHEADER), AVPALETTE_SIZE)); else /* Palette size in biClrUsed */ memcpy(avctx->palctrl->palette, sh->bih+1, - min(sh->bih->biClrUsed * 4, AVPALETTE_SIZE)); + FFMIN(sh->bih->biClrUsed * 4, AVPALETTE_SIZE)); } if(sh->bih) diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 9a46a1ad23..8fee8d1d8c 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -124,7 +124,7 @@ void x264enc_set_param(m_option_t* opt, char* arg) if(turbo == 1) { param.i_frame_reference = ( param.i_frame_reference + 1 ) >> 1; - param.analyse.i_subpel_refine = max( min( 3, param.analyse.i_subpel_refine - 1 ), 1 ); + param.analyse.i_subpel_refine = FFMAX( FFMIN( 3, param.analyse.i_subpel_refine - 1 ), 1 ); param.analyse.inter &= ( ~X264_ANALYSE_PSUB8x8 ); param.analyse.inter &= ( ~X264_ANALYSE_BSUB16x16 ); param.analyse.i_trellis = 0; |