diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:02:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:02:35 +0100 |
| commit | 78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d (patch) | |
| tree | f4bfafaf29f67c4e8224a8b2fac8a19c00a7c1f9 /libswscale/utils.c | |
| parent | 9766d9c9851577d8162d5f006dffc721902a1409 (diff) | |
| parent | 652f5185945c8405fc57aed353286858df8d066f (diff) | |
Merge commit '652f5185945c8405fc57aed353286858df8d066f'
* commit '652f5185945c8405fc57aed353286858df8d066f':
x86: mmx2 ---> mmxext in comments and messages
Conflicts:
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/utils.c')
| -rw-r--r-- | libswscale/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 9ee4e824d1..95d81d8f06 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -643,7 +643,7 @@ static int initMMX2HScaler(int dstW, int xInc, uint8_t *filterCode, int xpos, i; // create an optimized horizontal scaling routine - /* This scaler is made of runtime-generated MMX2 code using specially tuned + /* This scaler is made of runtime-generated MMXEXT code using specially tuned * pshufw instructions. For every four output pixels, if four input pixels * are enough for the fast bilinear scaling, then a chunk of fragmentB is * used. If five input pixels are needed, then a chunk of fragmentA is used. @@ -1069,7 +1069,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, && (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 || isNBPS(c->srcFormat) || is16BPS(c->srcFormat) || isAnyRGB(c->srcFormat)) c->canMMX2BeUsed=0; @@ -1313,7 +1313,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, 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)) |