diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 17:02:35 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 17:02:35 +0400 |
| commit | 78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d (patch) | |
| tree | f4bfafaf29f67c4e8224a8b2fac8a19c00a7c1f9 /libswscale/swscale_internal.h | |
| 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/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 7795f67a84..1dc7242a78 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -312,10 +312,10 @@ typedef struct SwsContext { int vChrFilterSize; ///< Vertical filter size for chroma pixels. //@} - int lumMmx2FilterCodeSize; ///< Runtime-generated MMX2 horizontal fast bilinear scaler code size for luma/alpha planes. - int chrMmx2FilterCodeSize; ///< Runtime-generated MMX2 horizontal fast bilinear scaler code size for chroma planes. - uint8_t *lumMmx2FilterCode; ///< Runtime-generated MMX2 horizontal fast bilinear scaler code for luma/alpha planes. - uint8_t *chrMmx2FilterCode; ///< Runtime-generated MMX2 horizontal fast bilinear scaler code for chroma planes. + int lumMmx2FilterCodeSize; ///< Runtime-generated MMXEXT horizontal fast bilinear scaler code size for luma/alpha planes. + int chrMmx2FilterCodeSize; ///< Runtime-generated MMXEXT horizontal fast bilinear scaler code size for chroma planes. + uint8_t *lumMmx2FilterCode; ///< Runtime-generated MMXEXT horizontal fast bilinear scaler code for luma/alpha planes. + uint8_t *chrMmx2FilterCode; ///< Runtime-generated MMXEXT horizontal fast bilinear scaler code for chroma planes. int canMMX2BeUsed; |