Merge commit 'bc909626b0a3c107625f2cb4c85479d18de422a8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:24:02 +0000 (16:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:24:08 +0000 (16:24 +0200)
* commit 'bc909626b0a3c107625f2cb4c85479d18de422a8':
  twinvq: move all bitstream reading into single place

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

Simple merge