diff options
| -rw-r--r-- | libavdevice/oss_audio.c | 4 | ||||
| -rw-r--r-- | libavdevice/sndio_enc.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index d2ba601f7a..fc5d3c3dd1 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -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) { diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c index fb30f62ff7..30f19107cd 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; |