mirror of https://git.ffmpeg.org/ffmpeg.git
matroskadec: do not use avpacket internals
This commit is contained in:
parent
9221efef79
commit
34871beb5e
|
@ -1137,13 +1137,14 @@ static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska,
|
||||||
|
|
||||||
static int matroska_merge_packets(AVPacket *out, AVPacket *in)
|
static int matroska_merge_packets(AVPacket *out, AVPacket *in)
|
||||||
{
|
{
|
||||||
void *newdata = av_realloc(out->data, out->size+in->size);
|
int old_size = out->size;
|
||||||
if (!newdata)
|
int ret = av_grow_packet(out, in->size);
|
||||||
return AVERROR(ENOMEM);
|
if (ret < 0)
|
||||||
out->data = newdata;
|
return ret;
|
||||||
memcpy(out->data+out->size, in->data, in->size);
|
|
||||||
out->size += in->size;
|
memcpy(out->data + old_size, in->data, in->size);
|
||||||
av_destruct_packet(in);
|
|
||||||
|
av_free_packet(in);
|
||||||
av_free(in);
|
av_free(in);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue