Merge commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 11:30:44 +0000 (13:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 11:32:43 +0000 (13:32 +0200)
commit1df2e3c707d394ae28159400374ead8d7230f443
treed0d435fef43896ab0136c2426dd26910bc6c0e52
parent33f92a3ea297d7aa80613059aaf73053f5d23ad9
parent8d4dd55c37b14ecea596f3477b35bf6c20688d8b
Merge commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b'

* commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b':
  matroskadec: refactor matroska_decode_buffer

Conflicts:
libavformat/matroskadec.c

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