From 5d2a83571b0a3beaeced8ec3538159507fa7b96c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 19 Oct 2013 10:58:17 +0200 Subject: [PATCH] avformat/wtv: rename to wtv_common This helps git matchup files on merges correctly Signed-off-by: Michael Niedermayer --- libavformat/Makefile | 4 ++-- libavformat/{wtv.c => wtv_common.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename libavformat/{wtv.c => wtv_common.c} (100%) diff --git a/libavformat/Makefile b/libavformat/Makefile index 9d4b6268ad..a899da9c7a 100644 --- 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