Simplify: Use FFMIN.
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Tue, 29 Mar 2011 18:18:45 +0000 (20:18 +0200)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Tue, 29 Mar 2011 18:18:45 +0000 (20:18 +0200)
libavdevice/oss_audio.c
libavdevice/sndio_enc.c

index d2ba601..fc5d3c3 100644 (file)
@@ -179,9 +179,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) {
index fb30f62..30f1910 100644 (file)
@@ -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;