1 | *** ./mythtv/libs/libmythbase/compat.h.org 2012-03-31 20:52:30.430461503 -0400 |
---|
2 | --- ./mythtv/libs/libmythbase/compat.h 2012-03-31 20:59:05.935585911 -0400 |
---|
3 | *************** |
---|
4 | *** 44,49 **** |
---|
5 | --- 44,51 ---- |
---|
6 | # include <sys/resource.h> // for setpriority |
---|
7 | # include <sys/socket.h> |
---|
8 | # include <sys/wait.h> // For WIFEXITED on Mac OS X |
---|
9 | + # include <stdio.h> // for snprintf(), used by inline dlerror() |
---|
10 | + # include <unistd.h> // for usleep() |
---|
11 | #endif |
---|
12 | |
---|
13 | #ifdef USING_MINGW |
---|
14 | *** ./mythtv/libs/libmyth/rssparse.h.org 2012-03-31 20:52:30.427453729 -0400 |
---|
15 | --- ./mythtv/libs/libmyth/rssparse.h 2012-03-31 21:51:11.687438044 -0400 |
---|
16 | *************** |
---|
17 | *** 13,18 **** |
---|
18 | --- 13,19 ---- |
---|
19 | #include <QPair> |
---|
20 | #include <QMap> |
---|
21 | #include <QVariant> |
---|
22 | + #include <sys/types.h> |
---|
23 | |
---|
24 | #include "mythexp.h" |
---|
25 | |
---|
26 | *** ./mythtv/libs/libmythtv/audioinput.h.org 2012-03-31 22:41:55.626923063 -0400 |
---|
27 | --- ./mythtv/libs/libmythtv/audioinput.h 2012-03-31 22:41:22.478248297 -0400 |
---|
28 | *************** |
---|
29 | *** 22,27 **** |
---|
30 | --- 22,28 ---- |
---|
31 | #define _AUDIOINPUT_H_ |
---|
32 | |
---|
33 | #include <QString> |
---|
34 | + #include <unistd.h> |
---|
35 | |
---|
36 | class AudioInput |
---|
37 | { |
---|
38 | *** ./mythtv/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c.org 2012-03-31 20:52:29.923150437 -0400 |
---|
39 | --- ./mythtv/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 21:58:48.422270780 -0400 |
---|
40 | *************** |
---|
41 | *** 398,404 **** |
---|
42 | "2: \n\t"\ |
---|
43 | \ |
---|
44 | : "+a"(src), "+c"(dst)\ |
---|
45 | ! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ |
---|
46 | : "memory"\ |
---|
47 | );\ |
---|
48 | src += 4-(h+5)*srcStride;\ |
---|
49 | --- 398,404 ---- |
---|
50 | "2: \n\t"\ |
---|
51 | \ |
---|
52 | : "+a"(src), "+c"(dst)\ |
---|
53 | ! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ |
---|
54 | : "memory"\ |
---|
55 | );\ |
---|
56 | src += 4-(h+5)*srcStride;\ |
---|
57 | *************** |
---|
58 | *** 446,452 **** |
---|
59 | QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ |
---|
60 | "2: \n\t"\ |
---|
61 | : "+a"(src)\ |
---|
62 | ! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ |
---|
63 | : "memory"\ |
---|
64 | );\ |
---|
65 | tmp += 4;\ |
---|
66 | --- 446,452 ---- |
---|
67 | QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ |
---|
68 | "2: \n\t"\ |
---|
69 | : "+a"(src)\ |
---|
70 | ! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ |
---|
71 | : "memory"\ |
---|
72 | );\ |
---|
73 | tmp += 4;\ |
---|
74 | *************** |
---|
75 | *** 823,829 **** |
---|
76 | "2: \n\t"\ |
---|
77 | \ |
---|
78 | : "+a"(src), "+c"(dst)\ |
---|
79 | ! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ |
---|
80 | : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ |
---|
81 | "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ |
---|
82 | "memory"\ |
---|
83 | --- 823,829 ---- |
---|
84 | "2: \n\t"\ |
---|
85 | \ |
---|
86 | : "+a"(src), "+c"(dst)\ |
---|
87 | ! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ |
---|
88 | : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ |
---|
89 | "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ |
---|
90 | "memory"\ |
---|
91 | *************** |
---|
92 | *** 878,884 **** |
---|
93 | QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) |
---|
94 | "2: \n\t" |
---|
95 | : "+a"(src) |
---|
96 | ! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) |
---|
97 | : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", |
---|
98 | "%xmm4", "%xmm5", "%xmm6", "%xmm7",) |
---|
99 | "memory" |
---|
100 | --- 878,884 ---- |
---|
101 | QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) |
---|
102 | "2: \n\t" |
---|
103 | : "+a"(src) |
---|
104 | ! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) |
---|
105 | : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", |
---|
106 | "%xmm4", "%xmm5", "%xmm6", "%xmm7",) |
---|
107 | "memory" |
---|