[FFmpeg-soc] [soc]: r4834 - in amr: amr-ffmpeg.diff amrnbdata.h amrnbdec.c

[cmcq]

Author: cmcq
Date: Wed Jul 29 14:28:57 2009
New Revision: 4834

Log:
Adopt the new names for the floating-point source files

Modified:
   amr/amr-ffmpeg.diff
   amr/amrnbdata.h
   amr/amrnbdec.c

Modified: amr/amr-ffmpeg.diff
==============================================================================
--- amr/amr-ffmpeg.diff	Wed Jul 29 14:26:19 2009	(r4833)
+++ amr/amr-ffmpeg.diff	Wed Jul 29 14:28:57 2009	(r4834)
@@ -6,7 +6,7 @@ Index: libavcodec/Makefile
  OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
  OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
  OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o lpc.o
-+OBJS-$(CONFIG_AMRNB_DECODER)           += amrnbfloatdec.o qcelp_lsp.o celp_filters.o celp_math.o acelp_filters.o acelp_vectors.o
++OBJS-$(CONFIG_AMRNB_DECODER)           += amrnbdec.o qcelp_lsp.o celp_filters.o celp_math.o acelp_filters.o acelp_vectors.o
  OBJS-$(CONFIG_AMV_DECODER)             += sp5xdec.o mjpegdec.o mjpeg.o
  OBJS-$(CONFIG_APE_DECODER)             += apedec.o
  OBJS-$(CONFIG_ASV1_DECODER)            += asv1.o mpeg12data.o

Modified: amr/amrnbdata.h
==============================================================================
--- amr/amrnbdata.h	Wed Jul 29 14:26:19 2009	(r4833)
+++ amr/amrnbdata.h	Wed Jul 29 14:28:57 2009	(r4834)
@@ -22,12 +22,12 @@
 
 
 /**
- * @file libavcodec/amrnbfloatdata.h
+ * @file libavcodec/amrnbdata.h
  * AMR narrowband data and definitions
  */
 
-#ifndef AVCODEC_AMRNBFLOATDATA_H
-#define AVCODEC_AMRNBFLOATDATA_H
+#ifndef AVCODEC_AMRNBDATA_H
+#define AVCODEC_AMRNBDATA_H
 
 #include <stdint.h>
 
@@ -2362,5 +2362,5 @@ static const float *formant_low_d = form
 
 /**************************** end of tables *****************************/
 
-#endif /* AVCODEC_AMRNBFLOATDATA_H */
+#endif /* AVCODEC_AMRNBDATA_H */
 

Modified: amr/amrnbdec.c
==============================================================================
--- amr/amrnbdec.c	Wed Jul 29 14:26:19 2009	(r4833)
+++ amr/amrnbdec.c	Wed Jul 29 14:28:57 2009	(r4834)
@@ -1,5 +1,5 @@
 /*
- * AMR narrowband decoder (floating point)
+ * AMR narrowband decoder
  * Copyright (c) 2006-2007 Robert Swain
  * Copyright (c) 2009 Colin McQuillan
  *
@@ -22,7 +22,7 @@
 
 
 /**
- * @file libavcodec/amrnbfloatdec.c
+ * @file libavcodec/amrnbdec.c
  * AMR narrowband decoder (floating point)
  */
 
@@ -37,7 +37,7 @@
 #include "celp_filters.h"
 #include "acelp_filters.h"
 #include "acelp_vectors.h"
-#include "amrnbfloatdata.h"
+#include "amrnbdata.h"
 
 void ff_celp_lspf2lpc(const double *lspf, float *lpc);