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/arm | |
| 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/arm')
| -rw-r--r-- | libavcodec/arm/rv34dsp_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/rv40dsp_init_arm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/rv34dsp_init_arm.c b/libavcodec/arm/rv34dsp_init_arm.c index 10ff64704b..8bfe90b3d3 100644 --- a/libavcodec/arm/rv34dsp_init_arm.c +++ b/libavcodec/arm/rv34dsp_init_arm.c @@ -32,7 +32,7 @@ void ff_rv34_inv_transform_noround_dc_neon(int16_t *block); void ff_rv34_idct_add_neon(uint8_t *dst, ptrdiff_t stride, int16_t *block); void ff_rv34_idct_dc_add_neon(uint8_t *dst, ptrdiff_t stride, int dc); -av_cold void ff_rv34dsp_init_arm(RV34DSPContext *c, DSPContext *dsp) +av_cold void ff_rv34dsp_init_arm(RV34DSPContext *c) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavcodec/arm/rv40dsp_init_arm.c b/libavcodec/arm/rv40dsp_init_arm.c index 8fd0b9f6e3..59ef10b24b 100644 --- a/libavcodec/arm/rv40dsp_init_arm.c +++ b/libavcodec/arm/rv40dsp_init_arm.c @@ -139,7 +139,7 @@ static av_cold void ff_rv40dsp_init_neon(RV34DSPContext *c) c->rv40_weak_loop_filter[1] = ff_rv40_v_weak_loop_filter_neon; } -av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext *dsp) +av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c) { int cpu_flags = av_get_cpu_flags(); |