Ticket #1241: patchneondsp2.diff

libavcodec/arm/h264dsp_init_arm.c

@@ -70 +70 @@
 
 static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
 {
+    const int cpu_flags = av_get_cpu_flags();
+
+    if (!have_neon(cpu_flags))
+        return;
+
     if (bit_depth == 8) {
     c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
     c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
@@ -100 +105 @@
 
 void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
 {
-    int cpu_flags = av_get_cpu_flags();
-
-    if (have_neon(cpu_flags))
         ff_h264dsp_init_neon(c, bit_depth, chroma_format_idc);
 }

libavcodec/arm/h264pred_init_arm.c

@@ -46 +46 @@
 static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc)
 {
     const int high_depth = bit_depth > 8;
+    const int cpu_flags  = av_get_cpu_flags();
 
-    if (high_depth)
+    if (!have_neon(cpu_flags) || high_depth)
         return;
     if(chroma_format_idc == 1){
     h->pred8x8[VERT_PRED8x8     ] = ff_pred8x8_vert_neon;
@@ -78 +79 @@
 
 void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, int bit_depth, const int chroma_format_idc)
 {
-    int cpu_flags = av_get_cpu_flags();
-
-    if (have_neon(cpu_flags))
         ff_h264_pred_init_neon(h, codec_id, bit_depth, chroma_format_idc);
 }