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)
commita620c8321efcf51e3d35462a5b7f088815faed14
treef9d7deeb3874d0d6b00dfe6cab7aa93ef7b92bd8
parentaf5f9c08763baff271401cf7f7478bae4d5db8dc
parentc3e58f8fb75d8467161a65b85eb88281547ebab1
Merge commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1'

* commit 'c3e58f8fb75d8467161a65b85eb88281547ebab1':
  matroskaenc: restore compatibility with non referenced AVPacket

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