ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jun 30 11:45:14 2015 +0200| [8f9c39b3e8c99ffe8a75603138c37c711d9ae72f] | committer: Michael Niedermayer
avformat: rename asfdec.c to asfdec_f.c leaving it as asfdec.c confuses git Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f9c39b3e8c99ffe8a75603138c37c711d9ae72f --- libavformat/Makefile | 4 ++-- libavformat/{asfdec.c => asfdec_f.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 987f196..f348559 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -82,7 +82,7 @@ OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o OBJS-$(CONFIG_APNG_MUXER) += apngenc.o OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o -OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \ +OBJS-$(CONFIG_ASF_DEMUXER) += asfdec_f.o asf.o asfcrypt.o \ avlanguage.o OBJS-$(CONFIG_ASF_O_DEMUXER) += asfdec-o.o asf.o asfcrypt.o \ avlanguage.o @@ -471,7 +471,7 @@ 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_common.o asfdec.o asf.o asfcrypt.o \ +OBJS-$(CONFIG_WTV_DEMUXER) += wtvdec.o wtv_common.o asfdec_f.o asf.o asfcrypt.o \ avlanguage.o mpegts.o isom.o OBJS-$(CONFIG_WTV_MUXER) += wtvenc.o wtv_common.o \ mpegtsenc.o asf.o diff --git a/libavformat/asfdec.c b/libavformat/asfdec_f.c similarity index 100% rename from libavformat/asfdec.c rename to libavformat/asfdec_f.c _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
