diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 13:41:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 13:45:22 +0100 |
| commit | 91ae9bc51e0f61c1c1caa2e26caf6e2add906f38 (patch) | |
| tree | c34e41630707dfb662797aa0b0c8fa47ec4e9d66 | |
| parent | ab6c9332bfa1e20127a16392a0b85a4aa4840889 (diff) | |
| parent | 6bdb841b46d170d58488deaed720729b79223b1d (diff) | |
| download | ffmpeg-91ae9bc51e0f61c1c1caa2e26caf6e2add906f38.tar.gz | |
Merge commit '6bdb841b46d170d58488deaed720729b79223b1d'
* commit '6bdb841b46d170d58488deaed720729b79223b1d':
arm: h264qpel: use neon h264 qpel functions only if supported
* bug was fixed previously (in merge of buggy code):
h264: copy h264qpel dsp context to slice thread copies
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/h264qpel_init_arm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/h264qpel_init_arm.c b/libavcodec/arm/h264qpel_init_arm.c index f1382d1184..c826d9309a 100644 --- a/libavcodec/arm/h264qpel_init_arm.c +++ b/libavcodec/arm/h264qpel_init_arm.c @@ -22,6 +22,7 @@ #include <stdint.h> #include "config.h" +#include "libavutil/arm/cpu.h" #include "libavcodec/h264qpel.h" void ff_put_h264_qpel16_mc00_neon(uint8_t *, uint8_t *, int); @@ -94,10 +95,10 @@ void ff_avg_h264_qpel8_mc33_neon(uint8_t *, uint8_t *, int); void ff_h264qpel_init_arm(H264QpelContext *c, int bit_depth) { -#if HAVE_NEON const int high_bit_depth = bit_depth > 8; + int cpu_flags = av_get_cpu_flags(); - if (!high_bit_depth) { + if (have_neon(cpu_flags) && !high_bit_depth) { c->put_h264_qpel_pixels_tab[0][ 0] = ff_put_h264_qpel16_mc00_neon; c->put_h264_qpel_pixels_tab[0][ 1] = ff_put_h264_qpel16_mc10_neon; c->put_h264_qpel_pixels_tab[0][ 2] = ff_put_h264_qpel16_mc20_neon; @@ -166,5 +167,4 @@ void ff_h264qpel_init_arm(H264QpelContext *c, int bit_depth) c->avg_h264_qpel_pixels_tab[1][14] = ff_avg_h264_qpel8_mc23_neon; c->avg_h264_qpel_pixels_tab[1][15] = ff_avg_h264_qpel8_mc33_neon; } -#endif /* HAVE_NEON */ } |