diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:35:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:35:49 +0100 |
| commit | 60a0bc46cdba5f13d557624d3448628328ad0fb0 (patch) | |
| tree | 65788b23d15f155b742e5fd6d85e10c601f1d772 /libavcodec/rv34dsp.c | |
| parent | c4e394e46008c9e208f666d156f49f7ba500d73a (diff) | |
| parent | a846dccb29d2bb0798af1d47d06100eda9ca87cc (diff) | |
| download | ffmpeg-60a0bc46cdba5f13d557624d3448628328ad0fb0.tar.gz | |
Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'
* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
h264chroma: x86: Fix building with yasm disabled
rv34: Drop now unnecessary dsputil dependencies
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34dsp.c')
| -rw-r--r-- | libavcodec/rv34dsp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/rv34dsp.c b/libavcodec/rv34dsp.c index 676e823787..7234ee808b 100644 --- a/libavcodec/rv34dsp.c +++ b/libavcodec/rv34dsp.c @@ -24,7 +24,7 @@ * @file * RV30/40 decoder common dsp functions */ -#include "dsputil.h" + #include "rv34dsp.h" #include "libavutil/common.h" @@ -128,7 +128,8 @@ static void rv34_inv_transform_dc_noround_c(int16_t *block) /** @} */ // transform -av_cold void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp) { +av_cold void ff_rv34dsp_init(RV34DSPContext *c) +{ c->rv34_inv_transform = rv34_inv_transform_noround_c; c->rv34_inv_transform_dc = rv34_inv_transform_dc_noround_c; @@ -136,7 +137,7 @@ av_cold void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp) { c->rv34_idct_dc_add = rv34_idct_dc_add_c; if (ARCH_ARM) - ff_rv34dsp_init_arm(c, dsp); + ff_rv34dsp_init_arm(c); if (ARCH_X86) - ff_rv34dsp_init_x86(c, dsp); + ff_rv34dsp_init_x86(c); } |