Merge commit 'b6a0f5cde808d84626f07b11c381cc6ef0954940' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:01:26 +0000 (15:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:01:30 +0000 (15:01 +0200)
* commit 'b6a0f5cde808d84626f07b11c381cc6ef0954940':
  h264: do not use 422 functions for monochrome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/ppc/h264_altivec.c
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264dsp_init.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -210,10 -210,9 +210,10 @@@ H264_BIWEIGHT_10_SSE(4,  10
  void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
                           const int chroma_format_idc)
  {
 +#if HAVE_YASM
      int mm_flags = av_get_cpu_flags();
  
-     if (chroma_format_idc == 1 && EXTERNAL_MMXEXT(mm_flags))
+     if (chroma_format_idc <= 1 && EXTERNAL_MMXEXT(mm_flags))
          c->h264_loop_filter_strength = ff_h264_loop_filter_strength_mmxext;
  
      if (bit_depth == 8) {