It ensures that the packet is properly padded
and makes the code simpler.
Fixes trac ticket #1223.
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);
- if (!newdata)
- return AVERROR(ENOMEM);
- out->data = newdata;
- memcpy(out->data+out->size, in->data, in->size);
- out->size += in->size;
+ int ret = av_grow_packet(out, in->size);
+ if (ret < 0)
+ return ret;
+ memcpy(out->data + out->size - in->size, in->data, in->size);
av_destruct_packet(in);
av_free(in);
return 0;
av_destruct_packet(in);
av_free(in);
return 0;