aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2010-06-05 15:27:53 +0000
committerAlex Converse <alex.converse@gmail.com>2010-06-05 15:27:53 +0000
commit77b8320a4d178eafa5f0a02bd84d5cfb1d43f008 (patch)
tree629f93827d675268f0b41ae5395fa29e0e1382f6
parentdd8871a63b675b2f43879bd348eba0d4fd1b4078 (diff)
downloadffmpeg-77b8320a4d178eafa5f0a02bd84d5cfb1d43f008.tar.gz
Rename aac.c to aacdec.c.
Originally committed as revision 23489 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/aacdec.c (renamed from libavcodec/aac.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 376ba67b4f..ba13204779 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -42,7 +42,7 @@ OBJS-$(CONFIG_VAAPI) += vaapi.o
OBJS-$(CONFIG_VDPAU) += vdpau.o
# decoders/encoders/hardware accelerators
-OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o aacsbr.o
+OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
aacpsy.o aactab.o \
psymodel.o iirfilter.o \
diff --git a/libavcodec/aac.c b/libavcodec/aacdec.c
index ebbc4cd205..ebbc4cd205 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aacdec.c