mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
oss,sndio: simplify by using FFMIN.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
parent
6b105e3ee6
commit
c673c90515
@ -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) {
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user