diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:51:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:52:35 +0200 |
| commit | e1a5ee25e048ec506995e97d6f967a852a8140f4 (patch) | |
| tree | 16cc27d68d50fa3812b2ce748070fef68edf452a /libavcodec/arm/h264dsp_init_arm.c | |
| parent | c0f2ad3dbdeada7ba43b0510580467718f1334ca (diff) | |
| parent | 45e10e5c8d3df09c80a4d80483bff2712367f3fa (diff) | |
| download | ffmpeg-streaming-e1a5ee25e048ec506995e97d6f967a852a8140f4.zip ffmpeg-streaming-e1a5ee25e048ec506995e97d6f967a852a8140f4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Add assembly version of h264_find_start_code_candidate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/h264dsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index 8dec1f6..2cafbaf 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -24,6 +24,8 @@ #include "libavutil/arm/cpu.h" #include "libavcodec/h264dsp.h" +int ff_h264_find_start_code_candidate_armv6(const uint8_t *buf, int size); + void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0); void ff_h264_h_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha, @@ -106,6 +108,8 @@ av_cold void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, { int cpu_flags = av_get_cpu_flags(); + if (have_armv6(cpu_flags)) + c->h264_find_start_code_candidate = ff_h264_find_start_code_candidate_armv6; if (have_neon(cpu_flags)) h264dsp_init_neon(c, bit_depth, chroma_format_idc); } |
