aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2012-11-29 13:12:33 -0300
committerPaul B Mahol <onemda@gmail.com>2012-12-04 10:51:38 +0000
commit7f0e7fc9e2e668a535dec5a5c70aa95c7788700c (patch)
tree7fd0b947221c59a996f36bd68ee8f674dd840b3e
parent1696c72af4a5222e73d04f53fe55168233426a58 (diff)
downloadffmpeg-7f0e7fc9e2e668a535dec5a5c70aa95c7788700c.tar.gz
ast: Rename ast.c -> astdec.c
Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavformat/Makefile2
-rw-r--r--libavformat/astdec.c (renamed from libavformat/ast.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index daa406f682..75afd5bd4b 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -51,7 +51,7 @@ OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \
OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o
OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o
OBJS-$(CONFIG_ASS_MUXER) += assenc.o
-OBJS-$(CONFIG_AST_DEMUXER) += ast.o
+OBJS-$(CONFIG_AST_DEMUXER) += astdec.o
OBJS-$(CONFIG_AU_DEMUXER) += au.o pcm.o
OBJS-$(CONFIG_AU_MUXER) += au.o
OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o
diff --git a/libavformat/ast.c b/libavformat/astdec.c
index 5f69f47d44..5f69f47d44 100644
--- a/libavformat/ast.c
+++ b/libavformat/astdec.c