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