diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-05-17 15:29:58 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-05-19 10:21:37 +0200 |
| commit | a2077b85da5bf71167b11925aabbb738558a134d (patch) | |
| tree | 409109f53524a2c7909631e4e2e70941c8f47e83 /libavcodec/g729dec.c | |
| parent | e98a95e7792f9452bc790f2552d9ea24d0f7818e (diff) | |
g729: Merge g729.h into g729dec.c.
The header contains just a single define that is only used in g729dec.c.
Diffstat (limited to 'libavcodec/g729dec.c')
| -rw-r--r-- | libavcodec/g729dec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index 5763108d71..979b87fd27 100644 --- 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 |