diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:34:57 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:07:21 +0100 |
commit | db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (patch) | |
tree | 01b9286e8a7d1e83c4b8d734d7767a3115838561 /libavcodec/Makefile | |
parent | 2cf9ab655549cf2f25ba57ee84baa6d38530ec3b (diff) | |
parent | e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 (diff) | |
download | ffmpeg-streaming-db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5.zip ffmpeg-streaming-db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5.tar.gz |
Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'
* commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0':
wmv2: move IDCT to its own DSP context.
Conflicts:
libavcodec/dsputil.h
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth1-wmv2
tests/ref/vsynth/vsynth2-wmv2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e165db5..151e592 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -487,10 +487,10 @@ OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \ celp_filters.o \ acelp_vectors.o acelp_filters.o OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \ +OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2dsp.o \ msmpeg4.o msmpeg4data.o \ intrax8.o intrax8dsp.o -OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \ +OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2dsp.o \ msmpeg4.o msmpeg4enc.o msmpeg4data.o \ mpeg4videodec.o ituh263dec.o h263dec.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o |