diff options
| author | Zhang Rui <bbcallen@gmail.com> | 2015-07-14 09:47:26 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 05:43:41 +0300 |
| commit | 5db095793a28b1fa9b5547394c51edcf273ddb31 (patch) | |
| tree | f619321da7ea6c18ff44cf4edb5fede99eb6284f | |
| parent | 7dbfeeeb944893f841345d7f7b2d3039d353f675 (diff) | |
avutil/fifo: Fix the case where func() returns less bytes than requested in av_fifo_generic_write()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit fcbea93cf8777bbef2a393d26942b5d3c70a448d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavutil/fifo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 4ff3194c5f..f2fe93de75 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -129,7 +129,8 @@ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, do { int len = FFMIN(f->end - wptr, size); if (func) { - if (func(src, wptr, len) <= 0) + len = func(src, wptr, len); + if (len <= 0) break; } else { memcpy(wptr, src, len); |