Merge commit '652f5185945c8405fc57aed353286858df8d066f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:02:35 +0000 (14:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:02:35 +0000 (14:02 +0100)
* commit '652f5185945c8405fc57aed353286858df8d066f':
  x86: mmx2 ---> mmxext in comments and messages

Conflicts:
libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
1  2 
doc/optimization.txt
libavcodec/x86/dsputil_avg_template.c
libavcodec/x86/dsputil_mmx.c
libswscale/rgb2rgb.c
libswscale/rgb2rgb_template.c
libswscale/swscale_internal.h
libswscale/utils.c
libswscale/x86/output.asm
libswscale/x86/rgb2rgb.c
libswscale/x86/rgb2rgb_template.c
libswscale/x86/swscale.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1069,10 -1007,10 +1069,10 @@@ av_cold int sws_init_context(SwsContex
              && (flags & SWS_FAST_BILINEAR)) {
              if (flags & SWS_PRINT_INFO)
                  av_log(c, AV_LOG_INFO,
-                        "output width is not a multiple of 32 -> no MMX2 scaler\n");
+                        "output width is not a multiple of 32 -> no MMXEXT scaler\n");
          }
 -        if (usesHFilter)
 -            c->canMMX2BeUsed = 0;
 +        if (usesHFilter || isNBPS(c->srcFormat) || is16BPS(c->srcFormat) || isAnyRGB(c->srcFormat))
 +            c->canMMX2BeUsed=0;
      } else
          c->canMMX2BeUsed = 0;
  
  #else
                 "",
  #endif
 -               sws_format_name(dstFormat));
 +               av_get_pix_fmt_name(dstFormat));
  
          if (INLINE_MMXEXT(cpu_flags))
-             av_log(c, AV_LOG_INFO, "using MMX2\n");
+             av_log(c, AV_LOG_INFO, "using MMXEXT\n");
          else if (INLINE_AMD3DNOW(cpu_flags))
              av_log(c, AV_LOG_INFO, "using 3DNOW\n");
          else if (INLINE_MMX(cpu_flags))
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1689,8 -1614,8 +1689,8 @@@ static av_cold void RENAME(sws_init_swS
          }
      }
  
 -    if (c->srcBpc == 8 && c->dstBpc <= 10) {
 +    if (c->srcBpc == 8 && c->dstBpc <= 14) {
-     // Use the new MMX scaler if the MMX2 one can't be used (it is faster than the x86 ASM one).
+     // Use the new MMX scaler if the MMXEXT one can't be used (it is faster than the x86 ASM one).
  #if COMPILE_TEMPLATE_MMXEXT
      if (c->flags & SWS_FAST_BILINEAR && c->canMMX2BeUsed)
      {
Simple merge