From 098d8e0950d6efbfb628b612f45df45b3c2d7b05 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Mon, 12 Oct 2009 16:36:48 +0000 Subject: Simplify: use FFMIN Originally committed as revision 20213 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/aviobuf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavformat/aviobuf.c') diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index c670d48c98..dd6f9b6c95 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -107,9 +107,7 @@ void put_buffer(ByteIOContext *s, const unsigned char *buf, int size) int len; while (size > 0) { - len = (s->buf_end - s->buf_ptr); - if (len > size) - len = size; + len = FFMIN(s->buf_end - s->buf_ptr, size); memcpy(s->buf_ptr, buf, len); s->buf_ptr += len; -- cgit v1.2.3