Browse Source

matroskadec: do not use avpacket internals

tags/n1.1
Anton Khirnov 13 years ago
parent
commit
34871beb5e
1 changed files with 8 additions and 7 deletions
  1. +8
    -7
      libavformat/matroskadec.c

+ 8
- 7
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)
{
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;
av_destruct_packet(in);
int old_size = out->size;
int ret = av_grow_packet(out, in->size);
if (ret < 0)
return ret;

memcpy(out->data + old_size, in->data, in->size);

av_free_packet(in);
av_free(in);
return 0;
}


Loading…
Cancel
Save