diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-03-08 19:57:33 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-03-08 19:57:33 +0000 |
| commit | 0a4a2948b5e077534c024dfc8c9a2f629a1de9b1 (patch) | |
| tree | 2c63acf0212d827ea97cb6a27ec8bf9392b878bd /vlc/build/ffmpeg_x86_64_asm.patch | |
| parent | f6f506dbee72f4dc7433a913af82aff07706dee4 (diff) | |
| download | asb-0a4a2948b5e077534c024dfc8c9a2f629a1de9b1.tar.gz asb-0a4a2948b5e077534c024dfc8c9a2f629a1de9b1.tar.xz | |
This version of the patch is for ffmpeg-r22221
Diffstat (limited to '')
| -rw-r--r-- | vlc/build/ffmpeg_x86_64_asm.patch | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/vlc/build/ffmpeg_x86_64_asm.patch b/vlc/build/ffmpeg_x86_64_asm.patch index 59967585..3180011f 100644 --- a/vlc/build/ffmpeg_x86_64_asm.patch +++ b/vlc/build/ffmpeg_x86_64_asm.patch @@ -1,8 +1,8 @@ -diff -u -r ffmpeg-export-2009-11-16-orig/libavcodec/dsputil.h ffmpeg-export-2009-11-16/libavcodec/dsputil.h ---- ffmpeg-export-2009-11-16-orig/libavcodec/dsputil.h 2009-11-05 19:29:06.000000000 +0100 -+++ ffmpeg-export-2009-11-16/libavcodec/dsputil.h 2009-11-17 18:17:57.302478821 +0100 -@@ -750,10 +750,14 @@ - #define SINTABLE_CONST +diff -uar ffmpeg-r22221.orig/libavcodec/dsputil.h ffmpeg-r22221/libavcodec/dsputil.h +--- ffmpeg-r22221.orig/libavcodec/dsputil.h 2010-03-05 17:25:30.000000000 +0100 ++++ ffmpeg-r22221/libavcodec/dsputil.h 2010-03-08 20:48:47.000000000 +0100 +@@ -771,12 +771,16 @@ + #define SINETABLE_CONST #endif +#ifndef _ATTR_HIDDEN @@ -10,17 +10,20 @@ diff -u -r ffmpeg-export-2009-11-16-orig/libavcodec/dsputil.h ffmpeg-export-2009 +#endif + #define COSTABLE(size) \ -- COSTABLE_CONST DECLARE_ALIGNED_16(FFTSample, ff_cos_##size[size/2]) -+ COSTABLE_CONST DECLARE_ALIGNED_16(FFTSample, _ATTR_HIDDEN ff_cos_##size[size/2]) +- COSTABLE_CONST DECLARE_ALIGNED_16(FFTSample, ff_cos_##size)[size/2] ++ COSTABLE_CONST DECLARE_ALIGNED_16(FFTSample, _ATTR_HIDDEN ff_cos_##size)[size/2] #define SINTABLE(size) \ -- SINTABLE_CONST DECLARE_ALIGNED_16(FFTSample, ff_sin_##size[size/2]) -+ SINTABLE_CONST DECLARE_ALIGNED_16(FFTSample, _ATTR_HIDDEN ff_sin_##size[size/2]) +- SINTABLE_CONST DECLARE_ALIGNED_16(FFTSample, ff_sin_##size)[size/2] ++ SINTABLE_CONST DECLARE_ALIGNED_16(FFTSample, _ATTR_HIDDEN ff_sin_##size)[size/2] + #define SINETABLE(size) \ +- SINETABLE_CONST DECLARE_ALIGNED_16(float, ff_sine_##size)[size] ++ SINETABLE_CONST DECLARE_ALIGNED_16(float, _ATTR_HIDDEN ff_sine_##size)[size] extern COSTABLE(16); extern COSTABLE(32); extern COSTABLE(64); -diff -u -r ffmpeg-export-2009-11-16-orig/libavcodec/x86/dsputil_mmx.h ffmpeg-export-2009-11-16/libavcodec/x86/dsputil_mmx.h ---- ffmpeg-export-2009-11-16-orig/libavcodec/x86/dsputil_mmx.h 2009-08-29 18:55:50.000000000 +0200 -+++ ffmpeg-export-2009-11-16/libavcodec/x86/dsputil_mmx.h 2009-11-17 18:18:57.308110072 +0100 +diff -uar ffmpeg-r22221.orig/libavcodec/x86/dsputil_mmx.h ffmpeg-r22221/libavcodec/x86/dsputil_mmx.h +--- ffmpeg-r22221.orig/libavcodec/x86/dsputil_mmx.h 2010-03-05 17:25:27.000000000 +0100 ++++ ffmpeg-r22221/libavcodec/x86/dsputil_mmx.h 2010-03-08 20:45:24.000000000 +0100 @@ -25,39 +25,43 @@ #include <stdint.h> #include "libavcodec/dsputil.h" @@ -93,9 +96,9 @@ diff -u -r ffmpeg-export-2009-11-16-orig/libavcodec/x86/dsputil_mmx.h ffmpeg-exp #define LOAD4(stride,in,a,b,c,d)\ "movq 0*"#stride"+"#in", "#a"\n\t"\ -diff -u -r ffmpeg-export-2009-11-16-orig/libavcodec/x86/vc1dsp_mmx.c ffmpeg-export-2009-11-16/libavcodec/x86/vc1dsp_mmx.c ---- ffmpeg-export-2009-11-16-orig/libavcodec/x86/vc1dsp_mmx.c 2009-06-16 11:00:55.000000000 +0200 -+++ ffmpeg-export-2009-11-16/libavcodec/x86/vc1dsp_mmx.c 2009-11-17 18:17:52.350591828 +0100 +diff -uar ffmpeg-r22221.orig/libavcodec/x86/vc1dsp_mmx.c ffmpeg-r22221/libavcodec/x86/vc1dsp_mmx.c +--- ffmpeg-r22221.orig/libavcodec/x86/vc1dsp_mmx.c 2010-03-05 17:25:27.000000000 +0100 ++++ ffmpeg-r22221/libavcodec/x86/vc1dsp_mmx.c 2010-03-08 20:45:24.000000000 +0100 @@ -73,7 +73,10 @@ "movq %%mm"#R1", "#OFF"(%1) \n\t" \ "add %2, %0 \n\t" @@ -108,10 +111,10 @@ diff -u -r ffmpeg-export-2009-11-16-orig/libavcodec/x86/vc1dsp_mmx.c ffmpeg-expo /** Sacrifying mm6 allows to pipeline loads from src */ static void vc1_put_ver_16b_shift2_mmx(int16_t *dst, -diff -u -r ffmpeg-export-2009-11-16-orig/libswscale/swscale.c ffmpeg-export-2009-11-16/libswscale/swscale.c ---- ffmpeg-export-2009-11-16-orig/libswscale/swscale.c 2009-11-10 20:11:13.000000000 +0100 -+++ ffmpeg-export-2009-11-16/libswscale/swscale.c 2009-11-17 18:50:31.714916247 +0100 -@@ -221,6 +221,10 @@ +diff -uar ffmpeg-r22221.orig/libswscale/swscale.c ffmpeg-r22221/libswscale/swscale.c +--- ffmpeg-r22221.orig/libswscale/swscale.c 2010-03-05 17:25:34.000000000 +0100 ++++ ffmpeg-r22221/libswscale/swscale.c 2010-03-08 20:45:24.000000000 +0100 +@@ -131,6 +131,10 @@ write special BGR->BGR scaler */ @@ -122,7 +125,7 @@ diff -u -r ffmpeg-export-2009-11-16-orig/libswscale/swscale.c ffmpeg-export-2009 #if ARCH_X86 && CONFIG_GPL DECLARE_ASM_CONST(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL; DECLARE_ASM_CONST(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL; -@@ -246,22 +250,22 @@ +@@ -156,22 +160,22 @@ DECLARE_ASM_CONST(8, uint64_t, g15Mask)= 0x03E003E003E003E0LL; DECLARE_ASM_CONST(8, uint64_t, r15Mask)= 0x7C007C007C007C00LL; |