Ticket #1241: 1241-new.diff

libavcodec/arm/h264dsp_init_arm.c

@@ -68 +68 @@
                              DCTELEM *block, int stride,
                              const uint8_t nnzc[6*8]);
 
-static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
+void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc);
+
+void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
 {
+    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;

libavcodec/arm/h264pred_init_arm.c

@@ -43 +43 @@
 void ff_pred8x8_l00_dc_neon(uint8_t *src, int stride);
 void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride);
 
-static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc)
+void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc);
+
+void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc)
 {
+    int cpu_flags = av_get_cpu_flags();
     const int high_depth = bit_depth > 8;
 
+    if (!have_neon(cpu_flags))
+            return;
+
     if (high_depth)
         return;
     if(chroma_format_idc == 1){