From: Reimar Döffinger <[email protected]>
Signed-off-by: Anton Khirnov <[email protected]>
---
libavdevice/oss_audio.c | 4 +---
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 7c4a65d..8ea5d3a 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 6745ba4..49a52b3 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;
--
1.7.5.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
