diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 17:08:49 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 17:08:49 +0400 |
| commit | 4b874fc4fc2739db7a907ce430ac862e625b7387 (patch) | |
| tree | f3e116c3be4782c51b3843daa06dcb754e24ce27 /libswscale/swscale_internal.h | |
| parent | 78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d (diff) | |
| parent | a65bdceb060628881578afb29df4eb222421381f (diff) | |
Merge commit 'a65bdceb060628881578afb29df4eb222421381f'
* commit 'a65bdceb060628881578afb29df4eb222421381f':
x86: mmx2 ---> mmxext in variable names
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 1dc7242a78..6a942d6799 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -312,12 +312,12 @@ typedef struct SwsContext { int vChrFilterSize; ///< Vertical filter size for chroma pixels. //@} - 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 lumMmxextFilterCodeSize; ///< Runtime-generated MMXEXT horizontal fast bilinear scaler code size for luma/alpha planes. + int chrMmxextFilterCodeSize; ///< Runtime-generated MMXEXT horizontal fast bilinear scaler code size for chroma planes. + uint8_t *lumMmxextFilterCode; ///< Runtime-generated MMXEXT horizontal fast bilinear scaler code for luma/alpha planes. + uint8_t *chrMmxextFilterCode; ///< Runtime-generated MMXEXT horizontal fast bilinear scaler code for chroma planes. - int canMMX2BeUsed; + int canMMXEXTBeUsed; int dstY; ///< Last destination vertical line output from last slice. int flags; ///< Flags passed by the user to select scaler algorithm, optimizations, subsampling, etc... |