Merge commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Jun 2013 09:11:27 +0000 (11:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Jun 2013 09:11:31 +0000 (11:11 +0200)
* commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1':
  matroskaenc: restore compatibility with non referenced AVPacket

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/matroskaenc.c

Simple merge