summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/Makefile6
-rw-r--r--libavformat/asfdec.c (renamed from libavformat/asf.c)0
-rw-r--r--libavformat/asfenc.c (renamed from libavformat/asf-enc.c)0
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index c6b99e7f43..f4b4024a04 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -18,9 +18,9 @@ OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
OBJS-$(CONFIG_AMR_MUXER) += amr.o
OBJS-$(CONFIG_APC_DEMUXER) += apc.o
OBJS-$(CONFIG_APE_DEMUXER) += ape.o
-OBJS-$(CONFIG_ASF_DEMUXER) += asf.o asfcrypt.o riff.o
-OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o
-OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o
+OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asfcrypt.o riff.o
+OBJS-$(CONFIG_ASF_MUXER) += asfenc.o riff.o
+OBJS-$(CONFIG_ASF_STREAM_MUXER) += asfenc.o riff.o
OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o
OBJS-$(CONFIG_ASS_MUXER) += assenc.o
OBJS-$(CONFIG_AU_DEMUXER) += au.o raw.o
diff --git a/libavformat/asf.c b/libavformat/asfdec.c
index bcaf2a1c16..bcaf2a1c16 100644
--- a/libavformat/asf.c
+++ b/libavformat/asfdec.c
diff --git a/libavformat/asf-enc.c b/libavformat/asfenc.c
index ae6cc2d09a..ae6cc2d09a 100644
--- a/libavformat/asf-enc.c
+++ b/libavformat/asfenc.c