[SCM] libav/experimental: remove near duplicate function
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:08 UTC 2013
The following commit has been merged in the experimental branch:
commit 765d4f3b4a49e974c7f122068ae0a10109423048
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Jan 17 19:46:33 2007 +0000
remove near duplicate function
Originally committed as revision 7570 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index d334c36..0f53084 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -50,20 +50,7 @@ int av_fifo_size(AVFifoBuffer *f)
*/
int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size)
{
- int size = av_fifo_size(f);
-
- if (size < buf_size)
- return -1;
- while (buf_size > 0) {
- int len = FFMIN(f->end - f->rptr, buf_size);
- memcpy(buf, f->rptr, len);
- buf += len;
- f->rptr += len;
- if (f->rptr >= f->end)
- f->rptr = f->buffer;
- buf_size -= len;
- }
- return 0;
+ return av_fifo_generic_read(f, buf_size, NULL, buf);
}
/**
@@ -111,7 +98,11 @@ int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void
return -1;
while (buf_size > 0) {
int len = FFMIN(f->end - f->rptr, buf_size);
- func(dest, f->rptr, len);
+ if(func) func(dest, f->rptr, len);
+ else{
+ memcpy(dest, f->rptr, len);
+ dest = (uint8_t*)dest + len;
+ }
f->rptr += len;
if (f->rptr >= f->end)
f->rptr = f->buffer;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list