1 Submitted By: Andrew Benton <andy@benton.eu.com>
2 Date: 2012-06-15
3 Initial Package Version: 0.10.13
4 Upstream Status: From upstream
5 Origin:
6 http://git.videolan.org/?p=ffmpeg.git;a=patch;h=5f654897e325349dacf2546674e0510bb72ecb50
7
8 Description: Fixes compiling gst-ffmpeg with gcc-4.7
9
10 libavcodec/x86/h264_qpel_mmx.c: Assembler messages:
11 libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp'
12 libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp'
13 libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp'
14 libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp'
15 libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp'
16 libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp'
17 libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp'
18 make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1
19
20 Index: gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
21 ===================================================================
22 --- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700
23 +++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700
24 @@ -398,7 +398,7 @@
25 "2: \n\t"\
26 \
27 : "+a"(src), "+c"(dst)\
28 - : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
29 + : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
30 : "memory"\
31 );\
32 src += 4-(h+5)*srcStride;\
33 @@ -446,7 +446,7 @@
34 QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
35 "2: \n\t"\
36 : "+a"(src)\
37 - : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
38 + : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
39 : "memory"\
40 );\
41 tmp += 4;\
42 @@ -823,7 +823,7 @@
43 "2: \n\t"\
44 \
45 : "+a"(src), "+c"(dst)\
46 - : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
47 + : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
48 : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
49 "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
50 "memory"\
51 @@ -878,7 +878,7 @@
52 QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
53 "2: \n\t"
54 : "+a"(src)
55 - : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
56 + : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
57 : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
58 "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
59 "memory"
|
