Merge commit 'fa3a5dd4dea34baa6bb2f7fe6006fc4b2888f2aa'

[ffmpeg] / libavcodec / arm / vc1dsp_init_arm.c

diff --git a/libavcodec/arm/vc1dsp_init_arm.c b/libavcodec/arm/vc1dsp_init_arm.c
index 4a848484631895233a8925bbced3f3fe9ffb9eff..9dae22c822756a4d9c0e5aadce75210b04f6a125 100644 (file)
--- a/libavcodec/arm/vc1dsp_init_arm.c
+++ b/libavcodec/arm/vc1dsp_init_arm.c
@@ -20,17 +20,16 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/arm/cpu.h"
+#include "libavcodec/arm/startcode.h"
 #include "libavcodec/vc1dsp.h"
 #include "vc1dsp.h"
 
-int ff_startcode_find_candidate_armv6(const uint8_t *buf, int size);
-
 av_cold void ff_vc1dsp_init_arm(VC1DSPContext *dsp)
 {
     int cpu_flags = av_get_cpu_flags();
 
-    if (have_armv6(cpu_flags))
-        dsp->vc1_find_start_code_candidate = ff_startcode_find_candidate_armv6;
+    if (have_setend(cpu_flags))
+        dsp->startcode_find_candidate = ff_startcode_find_candidate_armv6;
     if (have_neon(cpu_flags))
         ff_vc1dsp_init_neon(dsp);
 }