diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-28 16:28:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-28 16:28:48 +0200 |
| commit | 416d2f7a1244e7e93e291786ac98313153f87db5 (patch) | |
| tree | 231d0d704cda257e4bc2a210df6b2fe553f407c6 /libavcodec/celp_math.h | |
| parent | fb6fb0dedbc103ba9cd4e7d63edee15317143b21 (diff) | |
| parent | 7627c35a81241c98768d2d1f13d576591cac0b1c (diff) | |
| download | ffmpeg-416d2f7a1244e7e93e291786ac98313153f87db5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: export some functions
configure: use HOSTCC_C/O in check_host_cc
configure: use AS_O setting in check_as
configure: use LD_O setting in check_ld()
Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
build: Restore dependency of acelp_filters.o on celp_math.o
celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
celp_math: Move ff_cos() to the only place it is used
build: Use portable abstraction for linker/hostcc output file syntax
configure: Fix shared library creation for OpenBSD
vp56: Don't use DECLARE_ALIGN on a typedef name
mss1: move code that will be reused by MSS2 decoder into separate file
mss1: merge decode_intra() and decode_inter()
avprobe: Get rid of ugly casts in the options table
vf_hqdn3d: Remove a duplicate inline declaration
Conflicts:
Makefile
configure
ffprobe.c
libavcodec/Makefile
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/celp_math.c
libavcodec/celp_math.h
libavcodec/dsputil.c
libavcodec/lsp.c
libavcodec/mss1.c
libavcodec/ra288.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/celp_math.h')
| -rw-r--r-- | libavcodec/celp_math.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/celp_math.h b/libavcodec/celp_math.h index 16cc19ccd7..f12f67880b 100644 --- a/libavcodec/celp_math.h +++ b/libavcodec/celp_math.h @@ -45,14 +45,6 @@ void ff_celp_math_init(CELPMContext *c); void ff_celp_math_init_mips(CELPMContext *c); /** - * fixed-point implementation of cosine in [0; PI) domain. - * @param arg fixed-point cosine argument, 0 <= arg < 0x4000 - * - * @return value of (1<<15) * cos(arg * PI / (1<<14)), -0x8000 <= result <= 0x7fff - */ -int16_t ff_cos(uint16_t arg); - -/** * fixed-point implementation of exp2(x) in [0; 1] domain. * @param power argument to exp2, 0 <= power <= 0x7fff * |