summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/Makefile4
-rw-r--r--libavcodec/twinvq.c2
-rw-r--r--libavcodec/vorbisdec.c (renamed from libavcodec/vorbis_dec.c)0
-rw-r--r--libavcodec/vorbisenc.c (renamed from libavcodec/vorbis_enc.c)0
4 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 784226f7af..fad435dee3 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -386,9 +386,9 @@ OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o
OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o
OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o
OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o
-OBJS-$(CONFIG_VORBIS_DECODER) += vorbis_dec.o vorbis.o \
+OBJS-$(CONFIG_VORBIS_DECODER) += vorbisdec.o vorbis.o \
vorbis_data.o xiph.o
-OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.o vorbis.o \
+OBJS-$(CONFIG_VORBIS_ENCODER) += vorbisenc.o vorbis.o \
vorbis_data.o
OBJS-$(CONFIG_VP3_DECODER) += vp3.o vp3dsp.o
OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56dsp.o \
diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c
index e1a8dc455b..985f71c8ca 100644
--- a/libavcodec/twinvq.c
+++ b/libavcodec/twinvq.c
@@ -234,7 +234,7 @@ static void memset_float(float *buf, float val, int size)
* be a multiple of four.
* @return the LPC value
*
- * @todo reuse code from vorbis_dec.c: vorbis_floor0_decode
+ * @todo reuse code from Vorbis decoder: vorbis_floor0_decode
*/
static float eval_lpc_spectrum(const float *lsp, float cos_val, int order)
{
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbisdec.c
index 5fa7be1365..5fa7be1365 100644
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbisdec.c
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbisenc.c
index 74933af4d5..74933af4d5 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbisenc.c