Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:36:25 +0000 (16:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:37:08 +0000 (16:37 +0200)
commit7d03e60c124be3e316636b0086910f1bcc1a797d
tree220474e6a324e3ab52b4bbd421bd01a668347dda
parenta97f7499909a589249844c46e54ff25bc2ae7720
parent86f4c59bd676672040b89d8fea4c9e3b59bfe7ab
Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'

* commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab':
  twinvq: Split VQF-specific part from common TwinVQ decoder core

Conflicts:
libavcodec/Makefile
libavcodec/twinvq.c

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