Changeset 09804cdb6bee5a2db80298a6eedf1a8a905d53da
- Timestamp:
- 31/01/08 18:21:33
(10 months ago)
- Author:
- Pierre d'Herbemont <pdherbemont@videolan.org>
- git-committer:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1201800093 +0000
- git-parent:
[4ecf7a645b2e9502c925ed523b547e3009ccfde7]
- git-author:
- Pierre d'Herbemont <pdherbemont@videolan.org> 1201800093 +0000
- Message:
ffmpeg-svn-mmx_removal-darwin9.patch: Update to match ffmpeg svn.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| re91b812 |
r09804cd |
|
| 21 | 21 | Index: libswscale/swscale.c |
|---|
| 22 | 22 | =================================================================== |
|---|
| 23 | | --- libswscale/swscale.c (revision 25527) |
|---|
| | 23 | --- libswscale/swscale.c (revision 25943) |
|---|
| 24 | 24 | +++ libswscale/swscale.c (working copy) |
|---|
| 25 | 25 | @@ -875,9 +875,7 @@ |
|---|
| … | … | |
| 49 | 49 | #undef HAVE_MMX |
|---|
| 50 | 50 | #undef HAVE_MMX2 |
|---|
| 51 | | @@ -1544,13 +1544,6 @@ |
|---|
| | 51 | @@ -1544,15 +1544,8 @@ |
|---|
| 52 | 52 | #if defined(RUNTIME_CPUDETECT) && defined (CONFIG_GPL) |
|---|
| 53 | 53 | #if defined(ARCH_X86) |
|---|
| 54 | | // ordered per speed fasterst first |
|---|
| | 54 | // ordered per speed fastest first |
|---|
| 55 | 55 | - if (flags & SWS_CPU_CAPS_MMX2) |
|---|
| 56 | 56 | - return swScale_MMX2; |
|---|
| … | … | |
| 60 | 60 | - return swScale_MMX; |
|---|
| 61 | 61 | - else |
|---|
| 62 | | return swScale_C; |
|---|
| 63 | | |
|---|
| | 62 | - return swScale_C; |
|---|
| | 63 | - |
|---|
| | 64 | + /* VLC Hack: only C */ |
|---|
| | 65 | + return swScale_C; |
|---|
| 64 | 66 | #else |
|---|
| | 67 | #ifdef ARCH_POWERPC |
|---|
| | 68 | if (flags & SWS_CPU_CAPS_ALTIVEC) |
|---|
| 65 | 69 | Index: libswscale/rgb2rgb.c |
|---|
| 66 | 70 | =================================================================== |
|---|
