Mercurial > mplayer.hg
comparison libmpcodecs/ae_pcm.c @ 21531:a90aa203186c
Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX
| author | reimar |
|---|---|
| date | Sat, 09 Dec 2006 12:24:11 +0000 |
| parents | 6ff3379a0862 |
| children | ca9da45d13e9 |
comparison
equal
deleted
inserted
replaced
| 21530:b755687aa485 | 21531:a90aa203186c |
|---|---|
| 34 return 1; | 34 return 1; |
| 35 } | 35 } |
| 36 | 36 |
| 37 static int encode_pcm(audio_encoder_t *encoder, uint8_t *dest, void *src, int nsamples, int max_size) | 37 static int encode_pcm(audio_encoder_t *encoder, uint8_t *dest, void *src, int nsamples, int max_size) |
| 38 { | 38 { |
| 39 max_size = min(nsamples, max_size); | 39 max_size = FFMIN(nsamples, max_size); |
| 40 memcpy(dest, src, max_size); | 40 memcpy(dest, src, max_size); |
| 41 return max_size; | 41 return max_size; |
| 42 } | 42 } |
| 43 | 43 |
| 44 static int set_decoded_len(audio_encoder_t *encoder, int len) | 44 static int set_decoded_len(audio_encoder_t *encoder, int len) |