patch by Kenan Gillet, kenan.gillet gmail com Originally committed as revision 15679 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -22,7 +22,7 @@ | |||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "acelp_pitch_delay.h" | #include "acelp_pitch_delay.h" | ||||
| #include "acelp_math.h" | |||||
| #include "celp_math.h" | |||||
| int ff_acelp_decode_8bit_to_1st_delay3(int ac_index) | int ff_acelp_decode_8bit_to_1st_delay3(int ac_index) | ||||
| { | { | ||||
| @@ -25,7 +25,7 @@ | |||||
| #include <assert.h> | #include <assert.h> | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "acelp_math.h" | |||||
| #include "celp_math.h" | |||||
| #ifdef G729_BITEXACT | #ifdef G729_BITEXACT | ||||
| /** | /** | ||||
| @@ -20,8 +20,8 @@ | |||||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||||
| */ | */ | ||||
| #ifndef AVCODEC_ACELP_MATH_H | |||||
| #define AVCODEC_ACELP_MATH_H | |||||
| #ifndef AVCODEC_CELP_MATH_H | |||||
| #define AVCODEC_CELP_MATH_H | |||||
| #include <stdint.h> | #include <stdint.h> | ||||
| @@ -83,4 +83,4 @@ static inline int bidir_sal(int value, int offset) | |||||
| else return value << offset; | else return value << offset; | ||||
| } | } | ||||
| #endif /* AVCODEC_ACELP_MATH_H */ | |||||
| #endif /* AVCODEC_CELP_MATH_H */ | |||||
| @@ -32,7 +32,7 @@ | |||||
| #include "g729.h" | #include "g729.h" | ||||
| #include "lsp.h" | #include "lsp.h" | ||||
| #include "acelp_math.h" | |||||
| #include "celp_math.h" | |||||
| #include "acelp_filters.h" | #include "acelp_filters.h" | ||||
| #include "acelp_pitch_delay.h" | #include "acelp_pitch_delay.h" | ||||
| #include "acelp_vectors.h" | #include "acelp_vectors.h" | ||||
| @@ -26,7 +26,7 @@ | |||||
| #define FRAC_BITS 14 | #define FRAC_BITS 14 | ||||
| #include "mathops.h" | #include "mathops.h" | ||||
| #include "lsp.h" | #include "lsp.h" | ||||
| #include "acelp_math.h" | |||||
| #include "celp_math.h" | |||||
| void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, int lsfq_max, int lp_order) | void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, int lsfq_max, int lp_order) | ||||
| { | { | ||||