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/rv40dsp.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/rv40dsp.c')
| -rw-r--r-- | libavcodec/rv40dsp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index 99b458c8f0..cea4552a51 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -25,7 +25,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "h264qpel.h" #include "rv34dsp.h" #include "libavutil/avassert.h" @@ -519,10 +518,11 @@ static int rv40_v_loop_filter_strength(uint8_t *src, ptrdiff_t stride, return rv40_loop_filter_strength(src, 1, stride, beta, beta2, edge, p1, q1); } -av_cold void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp) { +av_cold void ff_rv40dsp_init(RV34DSPContext *c) +{ H264QpelContext qpel; - ff_rv34dsp_init(c, dsp); + ff_rv34dsp_init(c); ff_h264qpel_init(&qpel, 8); c->put_pixels_tab[0][ 0] = qpel.put_h264_qpel_pixels_tab[0][0]; @@ -608,7 +608,7 @@ av_cold void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp) { c->rv40_loop_filter_strength[1] = rv40_v_loop_filter_strength; if (ARCH_X86) - ff_rv40dsp_init_x86(c, dsp); + ff_rv40dsp_init_x86(c); if (ARCH_ARM) - ff_rv40dsp_init_arm(c, dsp); + ff_rv40dsp_init_arm(c); } |