Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Jan 2015 20:25:26 +0000 (21:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Jan 2015 20:25:49 +0000 (21:25 +0100)
commitf95cd5a235bae89510cfe4320f2189c9cfbcc457
treef33d6e04e8abacf97b6c920aeb85d4f89ed5fe4d
parent1cf0f27985965c28049b7a8481c859867dad3948
parent51da7d02748cc54b7d009115e76efa940b99a8ef
Merge commit '51da7d02748cc54b7d009115e76efa940b99a8ef'

* commit '51da7d02748cc54b7d009115e76efa940b99a8ef':
  matroskaenc: refuse to write AAC without valid extradata

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