From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Tue, 29 Mar 2011 18:18:45 +0000 (+0200)
Subject: oss,sndio: simplify by using FFMIN.
X-Git-Tag: n0.8~87^2~28
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c673c90515ab553c9ed9f4e1997600d1b3e4e2bb;p=coroid%2Fffmpeg_saccubus.git

oss,sndio: simplify by using FFMIN.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
---

diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index af46ea890..fcbe26ba9 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -181,9 +181,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
     uint8_t *buf= pkt->data;
 
     while (size > 0) {
-        len = AUDIO_BLOCK_SIZE - s->buffer_ptr;
-        if (len > size)
-            len = size;
+        len = FFMIN(AUDIO_BLOCK_SIZE - s->buffer_ptr, size);
         memcpy(s->buffer + s->buffer_ptr, buf, len);
         s->buffer_ptr += len;
         if (s->buffer_ptr >= AUDIO_BLOCK_SIZE) {
diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c
index 6745ba489..49a52b355 100644
--- a/libavdevice/sndio_enc.c
+++ b/libavdevice/sndio_enc.c
@@ -49,9 +49,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
     int len, ret;
 
     while (size > 0) {
-        len = s->buffer_size - s->buffer_offset;
-        if (len > size)
-            len = size;
+        len = FFMIN(s->buffer_size - s->buffer_offset, size);
         memcpy(s->buffer + s->buffer_offset, buf, len);
         buf  += len;
         size -= len;