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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14915 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/g729.h b/libavcodec/g729.h
index 820221299e346fe159e28af0b7798f6c76e88e24..3192f9d92798b74f01265178be824840b4986b58 100644 (file)
--- a/libavcodec/g729.h
+++ b/libavcodec/g729.h
@@ -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
  */

diff --git a/libavcodec/g729data.h b/libavcodec/g729data.h
index 66dc4d3ce6b92925a35b6c0c699e8b1ec589b353..5334e4809377ebae2390e86ab026b28f0ae7eb75 100644 (file)
--- a/libavcodec/g729data.h
+++ b/libavcodec/g729data.h
@@ -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

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 987086453cc78cc363cb80d399983aaa43935469..f00e597865e925e7f68c52535c29acaf47cf9a3f 100644 (file)
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -30,6 +30,24 @@
 #include "libavutil/avutil.h"
 #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
  */