summaryrefslogtreecommitdiffstats
path: root/ffmpeg/build/ffmpeg_x86_64_asm.patch
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2011-11-09 08:27:51 +0000
committer Eric Hameleers <alien@slackware.com>2011-11-09 08:27:51 +0000
commitc000e16c5f5d10be309a08f05b70c551312ad7e7 (patch)
treeb685343e681488fb89f6642e764896047d13b1ab /ffmpeg/build/ffmpeg_x86_64_asm.patch
parentd8f872ab78b5258f2a22abdf71f41bea7d10af61 (diff)
downloadasb-c000e16c5f5d10be309a08f05b70c551312ad7e7.tar.gz
asb-c000e16c5f5d10be309a08f05b70c551312ad7e7.tar.xz
This patch was updated for ffmpeg-0.6
Diffstat (limited to 'ffmpeg/build/ffmpeg_x86_64_asm.patch')
-rw-r--r--ffmpeg/build/ffmpeg_x86_64_asm.patch28
1 files changed, 14 insertions, 14 deletions
diff --git a/ffmpeg/build/ffmpeg_x86_64_asm.patch b/ffmpeg/build/ffmpeg_x86_64_asm.patch
index f16b325d..ac77bfca 100644
--- a/ffmpeg/build/ffmpeg_x86_64_asm.patch
+++ b/ffmpeg/build/ffmpeg_x86_64_asm.patch
@@ -1,6 +1,6 @@
-diff -uarN ffmpeg-r23349.orig/libavcodec/fft.h ffmpeg-r23349/libavcodec/fft.h
---- ffmpeg-r23349.orig/libavcodec/fft.h 2010-05-27 16:29:06.000000000 +0200
-+++ ffmpeg-r23349/libavcodec/fft.h 2010-05-27 16:31:39.000000000 +0200
+diff -uarN ffmpeg-0.6.orig/libavcodec/fft.h ffmpeg-0.6/libavcodec/fft.h
+--- ffmpeg-0.6.orig/libavcodec/fft.h 2010-03-23 20:48:16.000000000 +0100
++++ ffmpeg-0.6/libavcodec/fft.h 2010-06-16 22:50:26.000000000 +0200
@@ -62,12 +62,16 @@
#define SINETABLE_CONST
#endif
@@ -21,9 +21,9 @@ diff -uarN ffmpeg-r23349.orig/libavcodec/fft.h ffmpeg-r23349/libavcodec/fft.h
extern COSTABLE(16);
extern COSTABLE(32);
extern COSTABLE(64);
-diff -uarN ffmpeg-r23349.orig/libavcodec/x86/dsputil_mmx.h ffmpeg-r23349/libavcodec/x86/dsputil_mmx.h
---- ffmpeg-r23349.orig/libavcodec/x86/dsputil_mmx.h 2010-05-27 16:29:04.000000000 +0200
-+++ ffmpeg-r23349/libavcodec/x86/dsputil_mmx.h 2010-05-27 16:31:39.000000000 +0200
+diff -uarN ffmpeg-0.6.orig/libavcodec/x86/dsputil_mmx.h ffmpeg-0.6/libavcodec/x86/dsputil_mmx.h
+--- ffmpeg-0.6.orig/libavcodec/x86/dsputil_mmx.h 2010-03-14 18:50:12.000000000 +0100
++++ ffmpeg-0.6/libavcodec/x86/dsputil_mmx.h 2010-06-16 22:50:26.000000000 +0200
@@ -25,39 +25,43 @@
#include <stdint.h>
#include "libavcodec/dsputil.h"
@@ -96,9 +96,9 @@ diff -uarN ffmpeg-r23349.orig/libavcodec/x86/dsputil_mmx.h ffmpeg-r23349/libavco
#define LOAD4(stride,in,a,b,c,d)\
"movq 0*"#stride"+"#in", "#a"\n\t"\
-diff -uarN ffmpeg-r23349.orig/libavcodec/x86/vc1dsp_mmx.c ffmpeg-r23349/libavcodec/x86/vc1dsp_mmx.c
---- ffmpeg-r23349.orig/libavcodec/x86/vc1dsp_mmx.c 2010-05-27 16:29:04.000000000 +0200
-+++ ffmpeg-r23349/libavcodec/x86/vc1dsp_mmx.c 2010-05-27 16:31:39.000000000 +0200
+diff -uarN ffmpeg-0.6.orig/libavcodec/x86/vc1dsp_mmx.c ffmpeg-0.6/libavcodec/x86/vc1dsp_mmx.c
+--- ffmpeg-0.6.orig/libavcodec/x86/vc1dsp_mmx.c 2010-03-06 23:37:08.000000000 +0100
++++ ffmpeg-0.6/libavcodec/x86/vc1dsp_mmx.c 2010-06-16 22:50:26.000000000 +0200
@@ -73,7 +73,11 @@
"movq %%mm"#R1", "#OFF"(%1) \n\t" \
"add %2, %0 \n\t"
@@ -112,10 +112,10 @@ diff -uarN ffmpeg-r23349.orig/libavcodec/x86/vc1dsp_mmx.c ffmpeg-r23349/libavcod
/** Sacrifying mm6 allows to pipeline loads from src */
static void vc1_put_ver_16b_shift2_mmx(int16_t *dst,
-diff -uarN ffmpeg-r23349.orig/libswscale/swscale.c ffmpeg-r23349/libswscale/swscale.c
---- ffmpeg-r23349.orig/libswscale/swscale.c 2010-05-27 16:29:09.000000000 +0200
-+++ ffmpeg-r23349/libswscale/swscale.c 2010-05-27 16:31:39.000000000 +0200
-@@ -122,6 +122,10 @@
+diff -uarN ffmpeg-0.6.orig/libswscale/swscale.c ffmpeg-0.6/libswscale/swscale.c
+--- ffmpeg-0.6.orig/libswscale/swscale.c 2010-06-03 22:16:42.000000000 +0200
++++ ffmpeg-0.6/libswscale/swscale.c 2010-06-16 22:50:26.000000000 +0200
+@@ -127,6 +127,10 @@
write special BGR->BGR scaler
*/
@@ -126,7 +126,7 @@ diff -uarN ffmpeg-r23349.orig/libswscale/swscale.c ffmpeg-r23349/libswscale/swsc
#if ARCH_X86
DECLARE_ASM_CONST(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL;
DECLARE_ASM_CONST(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL;
-@@ -147,22 +151,22 @@
+@@ -152,22 +156,22 @@
DECLARE_ASM_CONST(8, uint64_t, g15Mask)= 0x03E003E003E003E0LL;
DECLARE_ASM_CONST(8, uint64_t, r15Mask)= 0x7C007C007C007C00LL;