diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:45:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:46:10 +0200 |
commit | 77aafadc5655401e5806daed58300a2cccb19fb8 (patch) | |
tree | 5784ddb1ecdc62045e2db225279365e19f4358a1 /libavcodec/arm/h264dsp_init_arm.c | |
parent | de417982e8977a1dbf05b48c9d0400c500bb5268 (diff) | |
parent | db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8 (diff) |
Merge commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8'
* commit 'db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8':
h264: Move start code search functions into separate source files.
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/startcode.c
libavcodec/startcode.h
See: 270cede3f3772117454a14b620803d731036942d
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index 2027d1861e..f7aee1faa9 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -23,8 +23,7 @@ #include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" #include "libavcodec/h264dsp.h" - -int ff_startcode_find_candidate_armv6(const uint8_t *buf, int size); +#include "libavcodec/arm/startcode.h" void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0); @@ -109,7 +108,7 @@ av_cold void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, int cpu_flags = av_get_cpu_flags(); if (have_setend(cpu_flags)) - c->h264_find_start_code_candidate = ff_startcode_find_candidate_armv6; + c->startcode_find_candidate = ff_startcode_find_candidate_armv6; if (have_neon(cpu_flags)) h264dsp_init_neon(c, bit_depth, chroma_format_idc); } |