diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 10:06:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 10:07:30 +0200 |
| commit | 53015bb3b340885d576af87afd20479ecb126bf4 (patch) | |
| tree | 3651920967aeb6783257c323d1b1366db346b35c /libavformat/Makefile | |
| parent | ad649e829d6af3409ea1bb2d45cc4e1310f3ba69 (diff) | |
| parent | 794ca87d2bff2513118de8b97595b3e23070e67d (diff) | |
| download | ffmpeg-53015bb3b340885d576af87afd20479ecb126bf4.tar.gz | |
Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'
* commit '794ca87d2bff2513118de8b97595b3e23070e67d':
wvdec: split block header parsing into a separate file
Conflicts:
libavformat/Makefile
libavformat/wvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index eb4327a434..c12f127c6c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -398,7 +398,7 @@ OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv.o asfdec.o asf.o asfcrypt.o \ avlanguage.o mpegts.o isom.o OBJS-$(CONFIG_WTV_MUXER) += wtvenc.o wtv.o asf.o asfenc.o -OBJS-$(CONFIG_WV_DEMUXER) += wvdec.o apetag.o img2.o +OBJS-$(CONFIG_WV_DEMUXER) += wvdec.o wv.o apetag.o img2.o OBJS-$(CONFIG_WV_MUXER) += wvenc.o apetagenc.o OBJS-$(CONFIG_XA_DEMUXER) += xa.o OBJS-$(CONFIG_XBIN_DEMUXER) += bintext.o sauce.o |