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/x86/rv34dsp_init.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/x86/rv34dsp_init.c')
| -rw-r--r-- | libavcodec/x86/rv34dsp_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c index a93096791b..70f86299bb 100644 --- a/libavcodec/x86/rv34dsp_init.c +++ b/libavcodec/x86/rv34dsp_init.c @@ -31,7 +31,7 @@ void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_dc_add_sse4(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_add_mmxext(uint8_t *dst, ptrdiff_t stride, int16_t *block); -av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp) +av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c) { int mm_flags = av_get_cpu_flags(); |