diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:54:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 15:55:41 +0200 |
| commit | bb35864759197ac17fe0057b0897f14b0fc54788 (patch) | |
| tree | 9ac2a32eb5293d6bcc9dd0fa06c6a660da523532 /libavcodec/x86 | |
| parent | 526cb36e4b23d2aae14bba0d19947137ee94f263 (diff) | |
| parent | 1ec629308652b382a409ffa61e049c074ee5e695 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mlpdsp: adding missing file
dsputil: split out mlp dsp function
sh4: add required #include, fix build
averror: make error values proper negative values
build: do not use LIB as variable name
build: whitespace cosmetics
build: remove single-use variable THIS_LIB
Conflicts:
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/mlpdsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/mlpdsp.c b/libavcodec/x86/mlpdsp.c index f7c0f21f64..de28e22b52 100644 --- a/libavcodec/x86/mlpdsp.c +++ b/libavcodec/x86/mlpdsp.c @@ -20,7 +20,7 @@ */ #include "libavutil/x86/asm.h" -#include "libavcodec/dsputil.h" +#include "libavcodec/mlpdsp.h" #include "libavcodec/mlp.h" #if HAVE_7REGS && HAVE_INLINE_ASM @@ -173,7 +173,7 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, #endif /* HAVE_7REGS && HAVE_INLINE_ASM */ -void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx) +void ff_mlpdsp_init_x86(MLPDSPContext *c) { #if HAVE_7REGS && HAVE_INLINE_ASM c->mlp_filter_channel = mlp_filter_channel_x86; |