RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify: Use FFMIN.

This commit is contained in:
Reimar Döffinger 2011-03-29 20:18:45 +02:00
parent 621f4c98df
commit e76c0c6a00
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavdevice/oss_audio.c
View File

@ -179,9 +179,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) {

4
libavdevice/sndio_enc.c
View File

@ -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;