← Back to branch summary

~ubuntu-branches/debian/sid/mplayer/sid

« back to all changes in this revision

Viewing changes to debian/patches/51xsai.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): A Mennucc1
  • Date: 2009-03-23 10:05:45 UTC
  • mfrom: (4.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090323100545-x8h79obawnnte7kk
Tags: 1.0~rc2+svn20090303-5
debian/control : move docbook-xml,docbook-xsl,xsltproc from 
Build-Depends-Indep to Build-Depends, since they are needed to run
configure

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/51xsai.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## dpatch by  Reimar D�ffinger and mennucc1@debian.org
3
 
##
4
 
## DP: 2xsai filter generates side-by-side double-height images , bug 450999
5
 
 
6
 
@DPATCH@
7
 
diff -urNad mplayer-1.0~rc2~/libmpcodecs/vf_2xsai.c mplayer-1.0~rc2/libmpcodecs/vf_2xsai.c
8
 
--- mplayer-1.0~rc2~/libmpcodecs/vf_2xsai.c     2007/11/12 20:40:13     25031
9
 
+++ mplayer-1.0~rc2/libmpcodecs/vf_2xsai.c      2007/11/12 20:44:06     25032
10
 
@@ -88,7 +88,7 @@
11
 
                   uint32_t width, uint32_t height, int sbpp) {
12
 
 
13
 
        unsigned int x, y;
14
 
-       unsigned long color[16];
15
 
+       uint32_t color[16];
16
 
 
17
 
        /* Point to the first 3 lines. */
18
 
        src_line[0] = src;
19
 
@@ -109,13 +109,13 @@
20
 
                color[12] = *sbp;    color[13] = color[12];   color[14] = *(sbp + 1); color[15] = *(sbp + 2);
21
 
        }
22
 
        else {
23
 
-               unsigned long *lbp;
24
 
-               lbp = (unsigned long*)src_line[0];
25
 
+               uint32_t *lbp;
26
 
+               lbp = (uint32_t*)src_line[0];
27
 
                color[0] = *lbp;       color[1] = color[0];   color[2] = color[0];    color[3] = color[0];
28
 
                color[4] = color[0];   color[5] = color[0];   color[6] = *(lbp + 1);  color[7] = *(lbp + 2);
29
 
-               lbp = (unsigned long*)src_line[2];
30
 
+               lbp = (uint32_t*)src_line[2];
31
 
                color[8] = *lbp;     color[9] = color[8];     color[10] = *(lbp + 1); color[11] = *(lbp + 2);
32
 
-               lbp = (unsigned long*)src_line[3];
33
 
+               lbp = (uint32_t*)src_line[3];
34
 
                color[12] = *lbp;    color[13] = color[12];   color[14] = *(lbp + 1); color[15] = *(lbp + 2);
35
 
        }
36
 
 
37
 
@@ -127,7 +127,7 @@
38
 
                /* Todo: x = width - 2, x = width - 1 */
39
 
                
40
 
                for (x = 0; x < width; x++) {
41
 
-                       unsigned long product1a, product1b, product2a, product2b;
42
 
+                       uint32_t product1a, product1b, product2a, product2b;
43
 
 
44
 
 //---------------------------------------  B0 B1 B2 B3    0  1  2  3
45
 
 //                                         4  5* 6  S2 -> 4  5* 6  7
46
 
@@ -191,14 +191,14 @@
47
 
                                product1a = color[5];
48
 
        
49
 
                        if (PixelsPerMask == 2) {
50
 
-                               *((unsigned long *) (&dst_line[0][x * 4])) = product1a | (product1b << 16);
51
 
-                               *((unsigned long *) (&dst_line[1][x * 4])) = product2a | (product2b << 16);
52
 
+                               *((uint32_t *) (&dst_line[0][x * 4])) = product1a | (product1b << 16);
53
 
+                               *((uint32_t *) (&dst_line[1][x * 4])) = product2a | (product2b << 16);
54
 
                        }
55
 
                        else {
56
 
-                               *((unsigned long *) (&dst_line[0][x * 8])) = product1a;
57
 
-                               *((unsigned long *) (&dst_line[0][x * 8 + 4])) = product1b;
58
 
-                               *((unsigned long *) (&dst_line[1][x * 8])) = product2a;
59
 
-                               *((unsigned long *) (&dst_line[1][x * 8 + 4])) = product2b;
60
 
+                               *((uint32_t *) (&dst_line[0][x * 8])) = product1a;
61
 
+                               *((uint32_t *) (&dst_line[0][x * 8 + 4])) = product1b;
62
 
+                               *((uint32_t *) (&dst_line[1][x * 8])) = product2a;
63
 
+                               *((uint32_t *) (&dst_line[1][x * 8 + 4])) = product2b;
64
 
                        }
65
 
                        
66
 
                        /* Move color matrix forward */
67
 
@@ -215,10 +215,10 @@
68
 
                                        color[15] = *(((unsigned short*)src_line[3]) + x);
69
 
                                }
70
 
                                else {
71
 
-                                       color[3] = *(((unsigned long*)src_line[0]) + x);
72
 
-                                       color[7] = *(((unsigned long*)src_line[1]) + x);
73
 
-                                       color[11] = *(((unsigned long*)src_line[2]) + x);
74
 
-                                       color[15] = *(((unsigned long*)src_line[3]) + x);
75
 
+                                       color[3] = *(((uint32_t*)src_line[0]) + x);
76
 
+                                       color[7] = *(((uint32_t*)src_line[1]) + x);
77
 
+                                       color[11] = *(((uint32_t*)src_line[2]) + x);
78
 
+                                       color[15] = *(((uint32_t*)src_line[3]) + x);
79
 
                                }
80
 
                                x -= 3;
81
 
                        }
82
 
@@ -248,14 +248,14 @@
83
 
                        color[12] = *sbp;    color[13] = color[12];  color[14] = *(sbp + 1); color[15] = *(sbp + 2);
84
 
                }
85
 
                else {
86
 
-                       unsigned long *lbp;
87
 
-                       lbp = (unsigned long*)src_line[0];
88
 
+                       uint32_t *lbp;
89
 
+                       lbp = (uint32_t*)src_line[0];
90
 
                        color[0] = *lbp;     color[1] = color[0];    color[2] = *(lbp + 1);  color[3] = *(lbp + 2);
91
 
-                       lbp = (unsigned long*)src_line[1];
92
 
+                       lbp = (uint32_t*)src_line[1];
93
 
                        color[4] = *lbp;     color[5] = color[4];    color[6] = *(lbp + 1);  color[7] = *(lbp + 2);
94
 
-                       lbp = (unsigned long*)src_line[2];
95
 
+                       lbp = (uint32_t*)src_line[2];
96
 
                        color[8] = *lbp;     color[9] = color[9];    color[10] = *(lbp + 1); color[11] = *(lbp + 2);
97
 
-                       lbp = (unsigned long*)src_line[3];
98
 
+                       lbp = (uint32_t*)src_line[3];
99
 
                        color[12] = *lbp;    color[13] = color[12];  color[14] = *(lbp + 1); color[15] = *(lbp + 2);
100
 
                }
101