Merge commit '569d18aa9dc989c37bb4d4b968026fe5afa6fff9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:21:52 +0000 (15:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:25:45 +0000 (15:25 +0200)
* commit '569d18aa9dc989c37bb4d4b968026fe5afa6fff9':
  matroskadec: Verify realaudio codec parameters

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

Simple merge