Merge commit '870e75524aa0d00ebcd1d15589c8d29b84af1565'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 17:11:41 +0000 (19:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 17:11:46 +0000 (19:11 +0200)
* commit '870e75524aa0d00ebcd1d15589c8d29b84af1565':
  matroskadec: validate lace_size when parsed

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

Simple merge