Merge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 18:37:26 +0000 (20:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 18:39:47 +0000 (20:39 +0200)
commit8c51ea54897c2d8671b38efecc1422ad4ad344f9
tree5db81f5cb6c19150fe84252d8636c83c40b140fb
parentb8044972c4f23e2d2fdf2c5a8ba67019a5045149
parentc831ebf61629d219ebcaa9f02d262e67aad09d83
Merge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83'

* commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83':
  matroskadec: split frame parsing
  matroskadec: split laces parsing

Conflicts:
libavformat/matroskadec.c

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