diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-02 13:01:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-02 13:02:09 +0200 |
| commit | 4d4ec18b2142b1de4acf72a29748b2a51af0dd59 (patch) | |
| tree | 1e6b51a88821118e9750427798b1d3c5af1c96cc | |
| parent | 0beff42823223659d75e7382d41a1e2a954bbfad (diff) | |
| parent | d0a661d48a2b1466eda2b87ab72720bc63cf8fc1 (diff) | |
| download | ffmpeg-4d4ec18b2142b1de4acf72a29748b2a51af0dd59.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Add wmv2 dependency to vc1 compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6f986498a7..ba53df80a5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -445,7 +445,7 @@ OBJS-$(CONFIG_VB_DECODER) += vb.o OBJS-$(CONFIG_VBLE_DECODER) += vble.o OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1.o vc1data.o vc1dsp.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o \ - intrax8.o intrax8dsp.o + intrax8.o intrax8dsp.o wmv2dsp.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o |