diff options
| author | Danny Rawlins <monster.romster@gmail.com> | 2012-12-23 13:12:46 +1100 |
|---|---|---|
| committer | Danny Rawlins <monster.romster@gmail.com> | 2012-12-23 13:12:46 +1100 |
| commit | f5f85b66bc5a23f1ba37850eadc9641f15d7e0a5 (patch) | |
| tree | a21e512bdc6672284c93c5679a54db6deb805b66 /gst-ffmpeg/gst-ffmpeg-0.10.13-gcc-4.7-1.patch | |
| parent | 599f296c20ca2c5e02a4fe73a85f8765fefb1369 (diff) | |
| download | contrib-f5f85b66bc5a23f1ba37850eadc9641f15d7e0a5.tar.gz contrib-f5f85b66bc5a23f1ba37850eadc9641f15d7e0a5.tar.xz | |
gst-ffmpeg: fixes compiling issue on gcc 4.7.x FS#865
Diffstat (limited to 'gst-ffmpeg/gst-ffmpeg-0.10.13-gcc-4.7-1.patch')
| -rw-r--r-- | gst-ffmpeg/gst-ffmpeg-0.10.13-gcc-4.7-1.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/gst-ffmpeg/gst-ffmpeg-0.10.13-gcc-4.7-1.patch b/gst-ffmpeg/gst-ffmpeg-0.10.13-gcc-4.7-1.patch new file mode 100644 index 000000000..dd07e6c72 --- /dev/null +++ b/gst-ffmpeg/gst-ffmpeg-0.10.13-gcc-4.7-1.patch @@ -0,0 +1,59 @@ +Submitted By: Andrew Benton <andy@benton.eu.com> +Date: 2012-06-15 +Initial Package Version: 0.10.13 +Upstream Status: From upstream +Origin: +http://git.videolan.org/?p=ffmpeg.git;a=patch;h=5f654897e325349dacf2546674e0510bb72ecb50 + +Description: Fixes compiling gst-ffmpeg with gcc-4.7 + +libavcodec/x86/h264_qpel_mmx.c: Assembler messages: +libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' +libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' +make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1 + +Index: gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c +=================================================================== +--- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 ++++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 +@@ -398,7 +398,7 @@ + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ ++ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : "memory"\ + );\ + src += 4-(h+5)*srcStride;\ +@@ -446,7 +446,7 @@ + QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ + "2: \n\t"\ + : "+a"(src)\ +- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ ++ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ + : "memory"\ + );\ + tmp += 4;\ +@@ -823,7 +823,7 @@ + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ ++ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ + "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ + "memory"\ +@@ -878,7 +878,7 @@ + QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) + "2: \n\t" + : "+a"(src) +- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) ++ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7",) + "memory" |