diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 09:54:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 09:54:13 +0200 |
| commit | ad649e829d6af3409ea1bb2d45cc4e1310f3ba69 (patch) | |
| tree | f6858b074b1cad3c1a549578206eac0757a782f6 | |
| parent | 7a2edcf1c8d46234406083b3a3fdb21cfa28d33e (diff) | |
| parent | 0a1a94450a28eef854162f859e79ecfb9f97915b (diff) | |
| download | ffmpeg-ad649e829d6af3409ea1bb2d45cc4e1310f3ba69.tar.gz | |
Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'
* commit '0a1a94450a28eef854162f859e79ecfb9f97915b':
lavf: rename wv.c to wvdec.c
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/wvdec.c (renamed from libavformat/wv.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index ea3aceee52..eb4327a434 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) += wv.o apetag.o img2.o +OBJS-$(CONFIG_WV_DEMUXER) += wvdec.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 diff --git a/libavformat/wv.c b/libavformat/wvdec.c index 9816c35d71..9816c35d71 100644 --- a/libavformat/wv.c +++ b/libavformat/wvdec.c |