From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 22 May 2010 09:31:45 +0000 (+0000)
Subject: - fixed wrong asm constraints in mmx-asm.patch
X-Git-Tag: auto/th/avidemux-2_5_2-5~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Favidemux.git;a=commitdiff_plain;h=4e58f0b05dcdee7a80fc332312b546902d154ec4

- fixed wrong asm constraints in mmx-asm.patch

Changed files:
    avidemux-gcc-bug-mmx-x86.patch -> 1.2
---

diff --git a/avidemux-gcc-bug-mmx-x86.patch b/avidemux-gcc-bug-mmx-x86.patch
deleted file mode 100644
index 276badc..0000000
--- a/avidemux-gcc-bug-mmx-x86.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- avidemux_2.5.2/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp~	2010-04-29 20:25:15.862622029 +0200
-+++ avidemux_2.5.2/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp	2010-04-29 21:30:35.374874733 +0200
-@@ -25,7 +25,7 @@
- 
- #include"ADM_vidField.h"
- 
--#ifdef ADM_CPU_X86
-+#ifdef ADM_CPU_X86_64
- //	#define DEBUG_DEINT 1
- //	#define MMX_TRACE 1
- 	#include "ADM_mmxMacros.h"
-@@ -81,7 +81,7 @@
-                       }
-            }
- }
--#ifdef ADM_CPU_X86
-+#ifdef ADM_CPU_X86_64
- void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
- 									uint8_t *n,
- 									uint8_t *e,
---- avidemux_2.5.2/avidemux/ADM_coreImage/src/ADM_vidFields.cpp~	2010-04-29 20:25:15.871621667 +0200
-+++ avidemux_2.5.2/avidemux/ADM_coreImage/src/ADM_vidFields.cpp	2010-04-29 21:31:24.857871769 +0200
-@@ -103,7 +103,7 @@
-            e2=_motionmask2+w; 	
-   //___________________ C version of motion detection ________________________
-        // other line
--#if defined(ADM_CPU_X86) && defined(ASM_DEINT)
-+#if defined(ADM_CPU_X86_64) && defined(ASM_DEINT)
-        if(CpuCaps::hasMMX())  
-       	hasMotion_MMX(p,c,n,e,e2);
-        else