Merge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Aug 2013 12:46:56 +0000 (14:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Aug 2013 12:47:15 +0000 (14:47 +0200)
* commit '9e7b62f0fb7462a902330fcc82cf596388f0187b':
  twinvq: set block align for codecs and use it in size checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/metasound.c
libavcodec/twinvq.c
libavcodec/twinvqdec.c

Simple merge
Simple merge
Simple merge