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)
commit9648c8e57b153f5783007a23fb9c360d0cb64a93
treea97f6a651de669225e1df3f45b0b272a5e166079
parent0df55e1ba88600a14ed2bd5921fdf8279d63ae08
parentbc909626b0a3c107625f2cb4c85479d18de422a8
Merge commit 'bc909626b0a3c107625f2cb4c85479d18de422a8'

* commit 'bc909626b0a3c107625f2cb4c85479d18de422a8':
  twinvq: move all bitstream reading into single place

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