Mercurial > libavcodec.hg
changeset 4591:16c24b902f43 libavcodec
use FFMIN
patch by ramiro _at_ lisha.ufsc.br
| author | aurel |
|---|---|
| date | Sun, 25 Feb 2007 00:35:30 +0000 |
| parents | 7cb6b1272f34 |
| children | 9fc8acda3223 |
| files | indeo3.c |
| diffstat | 1 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/indeo3.c Sat Feb 24 11:59:26 2007 +0000 +++ b/indeo3.c Sun Feb 25 00:35:30 2007 +0000 @@ -97,10 +97,6 @@ long fflags2, unsigned char *hdr, unsigned char *buf2, int min_width_160); -#ifndef min -#define min(a,b) ((a) < (b) ? (a) : (b)) -#endif - /* ---------------------------------------------------------------------- */ static void iv_alloc_frames(Indeo3DecodeContext *s) { @@ -230,7 +226,7 @@ iv_Decode_Chunk(s, s->cur_frame->Ybuf, s->ref_frame->Ybuf, hdr_width, hdr_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos, - min(hdr_width, 160)); + FFMIN(hdr_width, 160)); if (!(s->avctx->flags & CODEC_FLAG_GRAY)) { @@ -241,7 +237,7 @@ iv_Decode_Chunk(s, s->cur_frame->Vbuf, s->ref_frame->Vbuf, chroma_width, chroma_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos, - min(chroma_width, 40)); + FFMIN(chroma_width, 40)); buf_pos = buf + 16 + offs3; offs = le2me_32(*(uint32_t *)buf_pos); @@ -249,7 +245,7 @@ iv_Decode_Chunk(s, s->cur_frame->Ubuf, s->ref_frame->Ubuf, chroma_width, chroma_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos, - min(chroma_width, 40)); + FFMIN(chroma_width, 40)); }