|
|
|
@ -237,8 +237,10 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s |
|
|
|
|
if(next == END_NOT_FOUND){ |
|
|
|
|
void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE); |
|
|
|
|
|
|
|
|
|
if(!new_buffer) |
|
|
|
|
if(!new_buffer) { |
|
|
|
|
pc->index = 0; |
|
|
|
|
return AVERROR(ENOMEM); |
|
|
|
|
} |
|
|
|
|
pc->buffer = new_buffer; |
|
|
|
|
memcpy(&pc->buffer[pc->index], *buf, *buf_size); |
|
|
|
|
pc->index += *buf_size; |
|
|
|
@ -251,9 +253,11 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s |
|
|
|
|
/* append to buffer */ |
|
|
|
|
if(pc->index){ |
|
|
|
|
void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE); |
|
|
|
|
|
|
|
|
|
if(!new_buffer) |
|
|
|
|
if(!new_buffer) { |
|
|
|
|
pc->overread_index = |
|
|
|
|
pc->index = 0; |
|
|
|
|
return AVERROR(ENOMEM); |
|
|
|
|
} |
|
|
|
|
pc->buffer = new_buffer; |
|
|
|
|
if (next > -FF_INPUT_BUFFER_PADDING_SIZE) |
|
|
|
|
memcpy(&pc->buffer[pc->index], *buf, |
|
|
|
|