diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:03:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:04:11 +0200 |
| commit | f9418d156fe641af50d05114a9787a3bdb579369 (patch) | |
| tree | 85db1ae696dfaba1b5603d412a57ac19d6391b37 /libavcodec/vp56dsp.c | |
| parent | b99d3613cfdb5714a3c0e18b0db209280d879a10 (diff) | |
| parent | 8506ff97c9ea4a1f52983497ecf8d4ef193403a9 (diff) | |
| download | ffmpeg-streaming-f9418d156fe641af50d05114a9787a3bdb579369.zip ffmpeg-streaming-f9418d156fe641af50d05114a9787a3bdb579369.tar.gz | |
Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'
* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
vp56: Mark VP6-only optimizations as such.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56dsp.c')
| -rw-r--r-- | libavcodec/vp56dsp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/vp56dsp.c b/libavcodec/vp56dsp.c index 8c17fd9..fa533ec 100644 --- a/libavcodec/vp56dsp.c +++ b/libavcodec/vp56dsp.c @@ -88,9 +88,11 @@ av_cold void ff_vp56dsp_init(VP56DSPContext *s, enum AVCodecID codec) if (CONFIG_VP6_DECODER) { s->vp6_filter_diag4 = ff_vp6_filter_diag4_c; + + if (ARCH_ARM) + ff_vp6dsp_init_arm(s, codec); + if (ARCH_X86) + ff_vp6dsp_init_x86(s, codec); } } - - if (ARCH_ARM) ff_vp56dsp_init_arm(s, codec); - if (ARCH_X86) ff_vp56dsp_init_x86(s, codec); } |
