diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 19:41:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 21:10:27 +0200 |
| commit | a5e0c4ddb56b6a79e6e9b506d8b48f359a539287 (patch) | |
| tree | a6fa5347689ad57acc61d981503239f0ffc95cdf | |
| parent | 0b61af73823e88444b585c156d6c7b3677ce03bf (diff) | |
| download | ffmpeg-a5e0c4ddb56b6a79e6e9b506d8b48f359a539287.tar.gz | |
Revert "g729: Merge g729.h into g729dec.c."
This reverts commit a2077b85da5bf71167b11925aabbb738558a134d.
| -rw-r--r-- | libavcodec/g729.h | 29 | ||||
| -rw-r--r-- | libavcodec/g729dec.c | 7 |
2 files changed, 30 insertions, 6 deletions
diff --git a/libavcodec/g729.h b/libavcodec/g729.h new file mode 100644 index 0000000000..462cf8f1ac --- /dev/null +++ b/libavcodec/g729.h @@ -0,0 +1,29 @@ +/* + * G.729 decoder + * Copyright (c) 2008 Vladimir Voroshilov + * + * This file is part of FFmpeg. + * + * FFmpeg 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. + * + * FFmpeg 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 FFmpeg; 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 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 |