Merge commit 'b90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:05:14 +0000 (13:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:09:24 +0000 (13:09 +0200)
commit5353bd0285277df9d81d143c262c4698fba4dc6a
tree388eb494233d00b1085f7d4b3910cd496c383fa6
parent065996b9843b6366bab23d0c6adc61c05c0f9f75
parentb90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1
Merge commit 'b90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1' into release/1.1

* commit 'b90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1':
  matroska: Update the available size after lace parsing

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