[FFmpeg-cvslog] r14915 - in trunk/libavcodec: g729.h g729data.h g729dec.c

[voroshil]

Author: voroshil
Date: Sat Aug 23 14:38:45 2008
New Revision: 14915

Log:
Move from g729.h all definitions which are used only in g729dec.c


Modified:
   trunk/libavcodec/g729.h
   trunk/libavcodec/g729data.h
   trunk/libavcodec/g729dec.c

Modified: trunk/libavcodec/g729.h
==============================================================================
--- trunk/libavcodec/g729.h	(original)
+++ trunk/libavcodec/g729.h	Sat Aug 23 14:38:45 2008
@@ -23,27 +23,6 @@
 
 #include <stdint.h>
 
-/// Moving Average (MA) prediction order
-#define MA_NP                      4
-
-/**
- * minimum quantized LSF value (3.2.4)
- * 0.005 in Q13
- */
-#define LSFQ_MIN                   40
-
-/**
- * maximum quantized LSF value (3.2.4)
- * 3.135 in Q13
- */
-#define LSFQ_MAX                   25681
-
-/**
- * minimum LSF distance (3.2.4)
- * 0.0391 in Q13
- */
-#define LSFQ_DIFF_MIN              321
-
 /**
  * maximum possible subframe size
  */

Modified: trunk/libavcodec/g729data.h
==============================================================================
--- trunk/libavcodec/g729data.h	(original)
+++ trunk/libavcodec/g729data.h	Sat Aug 23 14:38:45 2008
@@ -23,7 +23,9 @@
 #define FFMPEG_G729DATA_H
 
 #include <stdint.h>
-#include "g729.h"
+
+/// Moving Average (MA) prediction order
+#define MA_NP                      4
 
 /**
  * first stage LSP codebook

Modified: trunk/libavcodec/g729dec.c
==============================================================================
--- trunk/libavcodec/g729dec.c	(original)
+++ trunk/libavcodec/g729dec.c	Sat Aug 23 14:38:45 2008
@@ -31,6 +31,24 @@
 #include "bitstream.h"
 
 /**
+ * minimum quantized LSF value (3.2.4)
+ * 0.005 in Q13
+ */
+#define LSFQ_MIN                   40
+
+/**
+ * maximum quantized LSF value (3.2.4)
+ * 3.135 in Q13
+ */
+#define LSFQ_MAX                   25681
+
+/**
+ * minimum LSF distance (3.2.4)
+ * 0.0391 in Q13
+ */
+#define LSFQ_DIFF_MIN              321
+
+/**
  * \brief pseudo random number generator
  */
 static inline uint16_t g729_random(uint16_t value)