RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-02 04:52:09 +00:00
Code Issues Projects Releases Wiki Activity

simplify

Browse Source 
Originally committed as revision 7568 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-01-17 19:19:03 +00:00
parent 80036204af
commit f81b99b82b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/fifo.c
View File

@ -50,15 +50,12 @@ int av_fifo_size(AVFifoBuffer *f)
*/ */
int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size) int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size)
{ {
int len; int size = av_fifo_size(f);
int size = f->wptr - f->rptr;
if (size < 0)
size += f->end - f->buffer;
if (size < buf_size) if (size < buf_size)
return -1; return -1;
while (buf_size > 0) { while (buf_size > 0) {
len = FFMIN(f->end - f->rptr, buf_size); int len = FFMIN(f->end - f->rptr, buf_size);
memcpy(buf, f->rptr, len); memcpy(buf, f->rptr, len);
buf += len; buf += len;
f->rptr += len; f->rptr += len;