diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 18:01:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 18:06:39 +0200 |
| commit | 06dae71d477ce0f48d9a8451c710ef13d62abf6c (patch) | |
| tree | 2d35c975113d221ed3d6eb48a7717a04655fe82a /libavcodec/Makefile | |
| parent | 5320b34b9853e0c2ce51ee447abe42844e591cda (diff) | |
| parent | 246f869590b8c7313d26e1c2ef56db01f6fd2503 (diff) | |
| download | ffmpeg-06dae71d477ce0f48d9a8451c710ef13d62abf6c.tar.gz | |
Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'
* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
vmd: Split audio and video decoder
Conflicts:
libavcodec/vmdvideo.c
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 488c6defe1..51d2dd0299 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -474,8 +474,8 @@ OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1.o vc1data.o vc1dsp.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o \ wmv2dsp.o startcode.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o -OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o -OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o +OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o +OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdvideo.o OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o OBJS-$(CONFIG_VORBIS_DECODER) += vorbisdec.o vorbisdsp.o vorbis.o \ vorbis_data.o xiph.o |