diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:36:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:37:08 +0200 |
| commit | 7d03e60c124be3e316636b0086910f1bcc1a797d (patch) | |
| tree | 220474e6a324e3ab52b4bbd421bd01a668347dda /libavcodec/Makefile | |
| parent | a97f7499909a589249844c46e54ff25bc2ae7720 (diff) | |
| parent | 86f4c59bd676672040b89d8fea4c9e3b59bfe7ab (diff) | |
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>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 45d3d34ae5..8b69fb654a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -433,7 +433,7 @@ OBJS-$(CONFIG_TSCC_DECODER) += tscc.o msrledec.o OBJS-$(CONFIG_TSCC2_DECODER) += tscc2.o OBJS-$(CONFIG_TTA_DECODER) += tta.o ttadata.o OBJS-$(CONFIG_TTA_ENCODER) += ttaenc.o ttadata.o -OBJS-$(CONFIG_TWINVQ_DECODER) += twinvq.o +OBJS-$(CONFIG_TWINVQ_DECODER) += twinvqdec.o twinvq.o OBJS-$(CONFIG_TXD_DECODER) += txd.o s3tc.o OBJS-$(CONFIG_ULTI_DECODER) += ulti.o OBJS-$(CONFIG_UTVIDEO_DECODER) += utvideodec.o utvideo.o |