diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-07 02:04:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-07 02:04:00 +0100 |
| commit | ff4800c16bae15817b35eaa22d0113849849114b (patch) | |
| tree | 123864d2f3118a00ba05995aa956838dde208a04 /libavcodec/rv40dsp.c | |
| parent | d9ced9fec63e7363a52e4b2e7c3f7d2197256f38 (diff) | |
| parent | 4d9ec050a21c953f5a6e31483cf5ebd344afa3fd (diff) | |
| download | ffmpeg-ff4800c16bae15817b35eaa22d0113849849114b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Code cleanup - mpegvideo.c - 500-1000line
rv40: NEON optimised weighted prediction
rv40: NEON optimised chroma MC
ARM: move NEON H264 chroma mc to a separate file
rv34: NEON optimised inverse transform functions
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv40dsp.c')
| -rw-r--r-- | libavcodec/rv40dsp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index 11b7fae481..1fc247e88b 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -534,4 +534,6 @@ av_cold void ff_rv40dsp_init(RV34DSPContext *c, DSPContext* dsp) { if (HAVE_MMX) ff_rv40dsp_init_x86(c, dsp); + if (HAVE_NEON) + ff_rv40dsp_init_neon(c, dsp); } |