avformat/wtv: rename to wtv_common

This helps git matchup files on merges correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 9d4b6268ad520613b4e3a85bf3c2da2535a3b300..a899da9c7aa954f3f5897ee90eac6dd6b1b03952 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -405,9 +405,9 @@ OBJS-$(CONFIG_WEBVTT_DEMUXER)            += webvttdec.o subtitles.o
 OBJS-$(CONFIG_WEBVTT_MUXER)              += webvttenc.o
 OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood_aud.o
 OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood_vqa.o
-OBJS-$(CONFIG_WTV_DEMUXER)               += wtvdec.o wtv.o asfdec.o asf.o asfcrypt.o \
+OBJS-$(CONFIG_WTV_DEMUXER)               += wtvdec.o wtv_common.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_WTV_MUXER)                 += wtvenc.o wtv_common.o asf.o asfenc.o
 OBJS-$(CONFIG_WV_DEMUXER)                += wvdec.o wv.o apetag.o img2.o
 OBJS-$(CONFIG_WV_MUXER)                  += wvenc.o wv.o apetag.o img2.o
 OBJS-$(CONFIG_XA_DEMUXER)                += xa.o

diff --git a/libavformat/wtv.c b/libavformat/wtv_common.c
similarity index 100%
rename from libavformat/wtv.c
rename to libavformat/wtv_common.c