aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-11-01 18:40:42 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-11-01 18:40:42 +0000
commit76c443c6d4c6b414eea6b0826ff6a0361795234d (patch)
treec53340ccd6b2c475cdfd3588f8aedb78853f7e04
parentc31dea6136df692a3b0a3fcf490696b718fe9a05 (diff)
downloadffmpeg-76c443c6d4c6b414eea6b0826ff6a0361795234d.tar.gz
move adx.c to adxdec.c
Originally committed as revision 10904 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/adxdec.c (renamed from libavcodec/adx.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 68f53b6015..5b60323a99 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -259,7 +259,7 @@ OBJS-$(CONFIG_PCM_MULAW_DECODER) += pcm.o
OBJS-$(CONFIG_PCM_MULAW_ENCODER) += pcm.o
OBJS-$(CONFIG_ADPCM_4XM_DECODER) += adpcm.o
-OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adx.o
+OBJS-$(CONFIG_ADPCM_ADX_DECODER) += adxdec.o
OBJS-$(CONFIG_ADPCM_ADX_ENCODER) += adxenc.o
OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.o
diff --git a/libavcodec/adx.c b/libavcodec/adxdec.c
index cc7ca5ffcf..cc7ca5ffcf 100644
--- a/libavcodec/adx.c
+++ b/libavcodec/adxdec.c