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/dsputil.c | |
parent | 526cb36e4b23d2aae14bba0d19947137ee94f263 (diff) | |
parent | 1ec629308652b382a409ffa61e049c074ee5e695 (diff) | |
download | ffmpeg-streaming-bb35864759197ac17fe0057b0897f14b0fc54788.zip ffmpeg-streaming-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/dsputil.c')
-rw-r--r-- | libavcodec/dsputil.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 45db8c4..ec1f6dd 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2963,10 +2963,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) #undef dspfunc -#if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER - ff_mlp_init(c, avctx); -#endif - c->put_mspel_pixels_tab[0]= ff_put_pixels8x8_c; c->put_mspel_pixels_tab[1]= put_mspel8_mc10_c; c->put_mspel_pixels_tab[2]= put_mspel8_mc20_c; |