Merge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb'

* commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb':
  h264: do not use 422 functions for monochrome

See: 07abf13da4a7c3d23ce6bc6542d72e6252161736
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/arm/h264dsp_init_arm.c
Simple merge

diff --cc libavcodec/h264dsp.c
Simple merge

diff --cc libavcodec/h264pred.c
Simple merge

diff --cc libavcodec/ppc/h264dsp.c
Simple merge

diff --cc libavcodec/x86/h264_intrapred_init.c
Simple merge

diff --cc libavcodec/x86/h264dsp_init.c
index 30801c4,e9d93e0..ae449e7
--- 1/libavcodec/x86/h264dsp_init.c
--- 2/libavcodec/x86/h264dsp_init.c
+++ b/libavcodec/x86/h264dsp_init.c
@@@ -211,10 -211,9 +211,10 @@@ H264_BIWEIGHT_10_SSE(4,  10
  av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
                                   const int chroma_format_idc)
  {
 +#if HAVE_YASM
      int cpu_flags = av_get_cpu_flags();
  
-     if (chroma_format_idc == 1 && EXTERNAL_MMXEXT(cpu_flags))
+     if (chroma_format_idc <= 1 && EXTERNAL_MMXEXT(cpu_flags))
          c->h264_loop_filter_strength = ff_h264_loop_filter_strength_mmxext;
  
      if (bit_depth == 8) {