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 | |
| 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')
| -rw-r--r-- | libavcodec/g729.h | 29 | ||||
| -rw-r--r-- | libavcodec/g729dec.c | 7 |
2 files changed, 6 insertions, 30 deletions
diff --git a/libavcodec/g729.h b/libavcodec/g729.h deleted file mode 100644 index 9cae471bc2..0000000000 --- a/libavcodec/g729.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * G.729 decoder - * Copyright (c) 2008 Vladimir Voroshilov - * - * This file is part of Libav. - * - * Libav is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * Libav is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#ifndef AVCODEC_G729_H -#define AVCODEC_G729_H - -/** - * subframe size - */ -#define SUBFRAME_SIZE 40 - -#endif // AVCODEC_G729_H 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 |