mirror of https://git.ffmpeg.org/ffmpeg.git
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 fcbea93cf8
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
7dbfeeeb94
commit
5db095793a
|
@ -129,7 +129,8 @@ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size,
|
||||||
do {
|
do {
|
||||||
int len = FFMIN(f->end - wptr, size);
|
int len = FFMIN(f->end - wptr, size);
|
||||||
if (func) {
|
if (func) {
|
||||||
if (func(src, wptr, len) <= 0)
|
len = func(src, wptr, len);
|
||||||
|
if (len <= 0)
|
||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
memcpy(wptr, src, len);
|
memcpy(wptr, src, len);
|
||||||
|
|
Loading…
Reference in New Issue