aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g729dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-24 19:41:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-24 21:10:27 +0200
commita5e0c4ddb56b6a79e6e9b506d8b48f359a539287 (patch)
treea6fa5347689ad57acc61d981503239f0ffc95cdf /libavcodec/g729dec.c
parent0b61af73823e88444b585c156d6c7b3677ce03bf (diff)
downloadffmpeg-a5e0c4ddb56b6a79e6e9b506d8b48f359a539287.tar.gz
Revert "g729: Merge g729.h into g729dec.c."
This reverts commit a2077b85da5bf71167b11925aabbb738558a134d.
Diffstat (limited to 'libavcodec/g729dec.c')
-rw-r--r--libavcodec/g729dec.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index c4a883f392..28dbad5903 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -30,6 +30,7 @@
#include "libavutil/avutil.h"
#include "get_bits.h"
+#include "g729.h"
#include "lsp.h"
#include "celp_math.h"
#include "acelp_filters.h"
@@ -70,12 +71,6 @@
*/
#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