Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / g729dec.c

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 8a35bdc83c4c122d6addb8e0220efe510c8f2918..32db0597e39cbcb7e861d97586c93368e8058020 100644 (file)
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -30,7 +30,6 @@
 #include "libavutil/avutil.h"
 #include "get_bits.h"
 
-#include "g729.h"
 #include "lsp.h"
 #include "celp_math.h"
 #include "acelp_filters.h"
@@ -71,6 +70,12 @@
  */
 #define SHARP_MAX                  13017
 
+/**
+ * subframe size
+ */
+#define SUBFRAME_SIZE              40
+
+
 typedef struct {
     uint8_t ac_index_bits[2];   ///< adaptive codebook index for second subframe (size in bits)
     uint8_t parity_bit;         ///< parity bit for pitch delay