Commit 0b2d5a8e authored by Ramiro Polla's avatar Ramiro Polla Committed by Aurelien Jacobs
Browse files

use FFMIN

patch by ramiro _at_ lisha.ufsc.br

Originally committed as revision 8119 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5dff1694
...@@ -97,10 +97,6 @@ static void iv_Decode_Chunk(Indeo3DecodeContext *s, unsigned char *cur, ...@@ -97,10 +97,6 @@ static void iv_Decode_Chunk(Indeo3DecodeContext *s, unsigned char *cur,
long fflags2, unsigned char *hdr, long fflags2, unsigned char *hdr,
unsigned char *buf2, int min_width_160); 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) static void iv_alloc_frames(Indeo3DecodeContext *s)
{ {
...@@ -230,7 +226,7 @@ static unsigned long iv_decode_frame(Indeo3DecodeContext *s, ...@@ -230,7 +226,7 @@ static unsigned long iv_decode_frame(Indeo3DecodeContext *s,
iv_Decode_Chunk(s, s->cur_frame->Ybuf, s->ref_frame->Ybuf, hdr_width, 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, 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)) if (!(s->avctx->flags & CODEC_FLAG_GRAY))
{ {
...@@ -241,7 +237,7 @@ static unsigned long iv_decode_frame(Indeo3DecodeContext *s, ...@@ -241,7 +237,7 @@ static unsigned long iv_decode_frame(Indeo3DecodeContext *s,
iv_Decode_Chunk(s, s->cur_frame->Vbuf, s->ref_frame->Vbuf, chroma_width, 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, chroma_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos,
min(chroma_width, 40)); FFMIN(chroma_width, 40));
buf_pos = buf + 16 + offs3; buf_pos = buf + 16 + offs3;
offs = le2me_32(*(uint32_t *)buf_pos); offs = le2me_32(*(uint32_t *)buf_pos);
...@@ -249,7 +245,7 @@ static unsigned long iv_decode_frame(Indeo3DecodeContext *s, ...@@ -249,7 +245,7 @@ static unsigned long iv_decode_frame(Indeo3DecodeContext *s,
iv_Decode_Chunk(s, s->cur_frame->Ubuf, s->ref_frame->Ubuf, chroma_width, 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, chroma_height, buf_pos + offs * 2, fflags2, hdr_pos, buf_pos,
min(chroma_width, 40)); FFMIN(chroma_width, 40));
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment