Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:49:28 +0000 (12:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:49:28 +0000 (12:49 +0200)
commit1c0ce2d4e0e70fcc42aa73fb5284f621025bb6c4
tree08d7d701df1802b6f72d84eb67e9962415ff8a13
parent69de229bb8818e97c88ad34840c9bd4a6854b647
parent4efdadc8ec50332c812e8a95e8c67f5a260e7cb0
Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'

* commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0':
  matroskadec: export just the STREAMINFO block as FLAC extradata

Conflicts:
libavformat/matroskadec.c

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