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/mlpdsp.c | |
| parent | 526cb36e4b23d2aae14bba0d19947137ee94f263 (diff) | |
| parent | 1ec629308652b382a409ffa61e049c074ee5e695 (diff) | |
| download | ffmpeg-bb35864759197ac17fe0057b0897f14b0fc54788.tar.gz | |
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/mlpdsp.c')
| -rw-r--r-- | libavcodec/mlpdsp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mlpdsp.c b/libavcodec/mlpdsp.c index 7ec8dd24e6..9a376e2206 100644 --- a/libavcodec/mlpdsp.c +++ b/libavcodec/mlpdsp.c @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dsputil.h" +#include "config.h" +#include "mlpdsp.h" #include "mlp.h" static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff, @@ -55,9 +56,9 @@ static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff, } } -void ff_mlp_init(DSPContext* c, AVCodecContext *avctx) +void ff_mlpdsp_init(MLPDSPContext *c) { c->mlp_filter_channel = ff_mlp_filter_channel; if (ARCH_X86) - ff_mlp_init_x86(c, avctx); + ff_mlpdsp_init_x86(c); } |