]> git.sesse.net Git - ffmpeg/commit
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)
commit6063f012f2f1c5c54ad518330d1d8cceba68d855
tree5133427c8c0e564034972be5416a3eef1f65f0d1
parente43c672b568e195a01e8748db096eff715eb7b5f
parent9e7b62f0fb7462a902330fcc82cf596388f0187b
Merge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b'

* commit '9e7b62f0fb7462a902330fcc82cf596388f0187b':
  twinvq: set block align for codecs and use it in size checks

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