diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:36:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:46:08 +0200 |
| commit | df5e089da95bc39b71f9cbee4152636758dc2041 (patch) | |
| tree | b9f7f8ffecf54b1586a78236f52d1a4674a9c562 /libavformat/Makefile | |
| parent | d8cfa983580402787e06093da8d242cd92a74428 (diff) | |
| parent | 31c54711cc3f1484af101d629bbb805820d37ad1 (diff) | |
Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'
* commit '31c54711cc3f1484af101d629bbb805820d37ad1':
lavf: split wav muxer and demuxer into separate files.
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 02784c8b7f..50be0cffe9 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -352,9 +352,9 @@ OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o OBJS-$(CONFIG_VQF_DEMUXER) += vqf.o -OBJS-$(CONFIG_W64_DEMUXER) += wav.o pcm.o -OBJS-$(CONFIG_WAV_DEMUXER) += wav.o pcm.o -OBJS-$(CONFIG_WAV_MUXER) += wav.o +OBJS-$(CONFIG_W64_DEMUXER) += wavdec.o pcm.o +OBJS-$(CONFIG_WAV_DEMUXER) += wavdec.o pcm.o +OBJS-$(CONFIG_WAV_MUXER) += wavenc.o OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ isom.o avc.o \ |