matroskadec: use av_grow_packet in merge_packets.
authorNicolas George <nicolas.george@normalesup.org>
Mon, 16 Apr 2012 16:02:02 +0000 (18:02 +0200)
committerNicolas George <nicolas.george@normalesup.org>
Mon, 16 Apr 2012 20:17:24 +0000 (22:17 +0200)
commitdcd207c4cbcd9dd72b73e5b544c055b29885be64
tree1529b39fbacb41be7de5db2789195e2a5136a758
parent1a65d50ee75372519625fff49d1d1a95ff5f4a6f
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.
libavformat/matroskadec.c