Skip to content

F
ffmpeg.wasm-core
Commit c673c905 authored by Reimar Döffinger's avatar Reimar Döffinger Committed by Anton Khirnov
Browse files
Options

oss,sndio: simplify by using FFMIN. 

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent 6b105e3e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
libavdevice/oss_audio.c
View file @ c673c905
...@@ -181,9 +181,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt) ...@@ -181,9 +181,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
uint8_t *buf= pkt->data; uint8_t *buf= pkt->data;
while (size > 0) { while (size > 0) {
len = AUDIO_BLOCK_SIZE - s->buffer_ptr; len = FFMIN(AUDIO_BLOCK_SIZE - s->buffer_ptr, size);
if (len > size)
len = size;
memcpy(s->buffer + s->buffer_ptr, buf, len); memcpy(s->buffer + s->buffer_ptr, buf, len);
s->buffer_ptr += len; s->buffer_ptr += len;
if (s->buffer_ptr >= AUDIO_BLOCK_SIZE) { if (s->buffer_ptr >= AUDIO_BLOCK_SIZE) {
......
libavdevice/sndio_enc.c
View file @ c673c905
...@@ -49,9 +49,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt) ...@@ -49,9 +49,7 @@ static int audio_write_packet(AVFormatContext *s1, AVPacket *pkt)
int len, ret; int len, ret;
while (size > 0) { while (size > 0) {
len = s->buffer_size - s->buffer_offset; len = FFMIN(s->buffer_size - s->buffer_offset, size);
if (len > size)
len = size;
memcpy(s->buffer + s->buffer_offset, buf, len); memcpy(s->buffer + s->buffer_offset, buf, len);
buf += len; buf += len;
size -= len; size -= len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment