matroskadec: use av_grow_packet in merge_packets.

It ensures that the packet is properly padded and makes the code simpler. Fixes trac ticket #1223.

Nicolas George committed 14 years ago

Commit dcd207c1 parent 1a65d501 file · +4 −6Browse files

Unified · Split

 static int matroska_merge_packets(AVPacket *out, AVPacket *in)
 {
-    void *newdata = av_realloc(out->data, out->size+in->size);
+    int ret = av_grow_packet(out, in->size);
-    if (!newdata)
+    if (ret < 0)
-        return AVERROR(ENOMEM);
+        return ret;
-    out->data = newdata;
+    memcpy(out->data + out->size - in->size, in->data, in->size);
-    memcpy(out->data+out->size, in->data, in->size);
-    out->size += in->size;
     av_destruct_packet(in);
     av_free(in);
     return 0;

Keyboard shortcuts