Merge commit '256ef198'

* commit '256ef198':
  h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

Conflicts:
	libavcodec/arm/h264pred_init_arm.c

See: 565cabf5Merged-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/arm/h264pred_init_arm.c

@@ -54,7 +54,8 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
 
     if (high_depth)
         return;
-    if(chroma_format_idc == 1){
+
+    if (chroma_format_idc <= 1) {
         h->pred8x8[VERT_PRED8x8     ] = ff_pred8x8_vert_neon;
         h->pred8x8[HOR_PRED8x8      ] = ff_pred8x8_hor_neon;
         if (codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)