diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-14 15:31:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-14 15:34:39 +0200 |
| commit | 7427d1ca4ab202def24fc3cefc4401a351d7248c (patch) | |
| tree | be2cd06e1e5457daad74966a0155e86baa5e9086 /libavcodec/x86/mlpdsp.c | |
| parent | 0e05908c954ff64ef2fcb2a97ed083bc285282c1 (diff) | |
| parent | 0d230e9312a676266bd6fa3478032db4860221a7 (diff) | |
| download | ffmpeg-7427d1ca4ab202def24fc3cefc4401a351d7248c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g723.1: simplify scale_vector()
g723.1: simplify normalize_bits()
vda: cosmetics: fix Doxygen comment formatting
vda: better frame allocation
vda: Merge implementation into one file
vda: support synchronous decoding
vda: Reuse the bitstream buffer and reallocate it only if needed
build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC
avprobe: Include libm.h for the log2 fallback
proresenc: use the edge emulation buffer
rtmp: handle bytes read reports
configure: Fix typo in mpeg2video/svq1 decoder dependency declaration
Use log2(x) instead of log(x) / log(2)
x86: swscale: fix fragile memory accesses
x86: swscale: remove disabled code
x86: yadif: fix asm with suncc
x86: cabac: allow building with suncc
x86: mlpdsp: avoid taking address of void
ARM: intmath: use native-size return types for clipping functions
Conflicts:
configure
ffprobe.c
libavcodec/Makefile
libavcodec/g723_1.c
libavcodec/v210dec.h
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/x86/cabac.h
libavfilter/x86/yadif_template.c
libswscale/x86/rgb2rgb_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/mlpdsp.c')
| -rw-r--r-- | libavcodec/x86/mlpdsp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libavcodec/x86/mlpdsp.c b/libavcodec/x86/mlpdsp.c index 6b9f9efd83..0cd0e4c2fb 100644 --- a/libavcodec/x86/mlpdsp.c +++ b/libavcodec/x86/mlpdsp.c @@ -25,21 +25,21 @@ #if HAVE_7REGS -extern void ff_mlp_firorder_8; -extern void ff_mlp_firorder_7; -extern void ff_mlp_firorder_6; -extern void ff_mlp_firorder_5; -extern void ff_mlp_firorder_4; -extern void ff_mlp_firorder_3; -extern void ff_mlp_firorder_2; -extern void ff_mlp_firorder_1; -extern void ff_mlp_firorder_0; - -extern void ff_mlp_iirorder_4; -extern void ff_mlp_iirorder_3; -extern void ff_mlp_iirorder_2; -extern void ff_mlp_iirorder_1; -extern void ff_mlp_iirorder_0; +extern char ff_mlp_firorder_8; +extern char ff_mlp_firorder_7; +extern char ff_mlp_firorder_6; +extern char ff_mlp_firorder_5; +extern char ff_mlp_firorder_4; +extern char ff_mlp_firorder_3; +extern char ff_mlp_firorder_2; +extern char ff_mlp_firorder_1; +extern char ff_mlp_firorder_0; + +extern char ff_mlp_iirorder_4; +extern char ff_mlp_iirorder_3; +extern char ff_mlp_iirorder_2; +extern char ff_mlp_iirorder_1; +extern char ff_mlp_iirorder_0; static const void *firtable[9] = { &ff_mlp_firorder_0, &ff_mlp_firorder_1, &ff_mlp_firorder_2, &ff_mlp_firorder_3, |