virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

matroskadec: do not use avpacket internals

Browse Source
This commit is contained in:
Anton Khirnov
2012-11-01 06:34:41 +01:00
parent 9221efef79
commit 34871beb5e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/matroskadec.c
View File

@@ -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;
} }