mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
Merge commit '24a362569bff1d4161742fffaca80a4a4428be8a'
* commit '24a362569bff1d4161742fffaca80a4a4428be8a': buffer: fix av_buffer_realloc() when the data is offset wrt buffer start Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
5e4a572699
@ -191,7 +191,7 @@ int av_buffer_realloc(AVBufferRef **pbuf, int size)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!(buf->buffer->flags & BUFFER_FLAG_REALLOCATABLE) ||
|
if (!(buf->buffer->flags & BUFFER_FLAG_REALLOCATABLE) ||
|
||||||
!av_buffer_is_writable(buf)) {
|
!av_buffer_is_writable(buf) || buf->data != buf->buffer->data) {
|
||||||
/* cannot realloc, allocate a new reallocable buffer and copy data */
|
/* cannot realloc, allocate a new reallocable buffer and copy data */
|
||||||
AVBufferRef *new = NULL;
|
AVBufferRef *new = NULL;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user