diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 11:45:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 12:23:12 +0200 |
| commit | 8f9c39b3e8c99ffe8a75603138c37c711d9ae72f (patch) | |
| tree | 4e6a8455448d486e77fa7d6be3e87aae9a2d6f9c | |
| parent | 6415dcb0131845489cb4e0ad7bd723694f98e060 (diff) | |
| download | ffmpeg-8f9c39b3e8c99ffe8a75603138c37c711d9ae72f.tar.gz | |
avformat: rename asfdec.c to asfdec_f.c
leaving it as asfdec.c confuses git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/Makefile | 4 | ||||
| -rw-r--r-- | libavformat/asfdec_f.c (renamed from libavformat/asfdec.c) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 987f196859..f348559399 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 index db8791e980..db8791e980 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec_f.c |