Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gst-plugins-good-09-videomixer.diff
author Jon Tibble <meths@btinternet.com>
Sat, 06 Oct 2012 16:11:50 +0100
branchs11express-2010-11
changeset 22109 db10202d5f6d
parent 18153 2f222bb8f8c5
child 18242 54c28d319822
permissions -rw-r--r--
Added tag oi_151a_prestable7 for changeset 25dee50cecca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18153
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     1
 
--- gst-plugins-good-0.10.18/gst/videomixer/blend.c-orig	2010-02-11 23:17:20.527586069 -0600
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     2
 
+++ gst-plugins-good-0.10.18/gst/videomixer/blend.c	2010-02-11 23:18:53.924253947 -0600
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     3
 
@@ -36,6 +36,8 @@
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     5
 
 #define BLEND(D,S,alpha) (((D) * (256 - (alpha)) + (S) * (alpha)) >> 8)
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     6
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     7
 
+#undef HAVE_GCC_ASM
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     8
 
+
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
 
 #ifdef HAVE_GCC_ASM
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    10
 
 #if defined(HAVE_CPU_I386) || defined(HAVE_CPU_X86_64)
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    11
 
 #define BUILD_X86_ASM
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    12
 
--- gst-plugins-good-0.10.18/gst/videomixer/videomixer.c-orig	2010-02-11 23:18:39.645783515 -0600
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    13
 
+++ gst-plugins-good-0.10.18/gst/videomixer/videomixer.c	2010-02-11 23:19:14.549603881 -0600
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    14
 
@@ -57,6 +57,8 @@
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    15
 
 #include "config.h"
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    16
 
 #endif
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    17
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    18
 
+#undef HAVE_GCC_ASM
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    19
 
+
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    20
 
 #ifdef HAVE_GCC_ASM
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    21
 
 #if defined(HAVE_CPU_I386) || defined(HAVE_CPU_X86_64)
2f222bb8f8c5 2010-06-21 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    22
 
 #define BUILD_X86_ASM
sustaining/oi_151a/spec-files