Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Backport http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=5f654897e325349dacf2546674e0510bb72ecb50;hp=250cebeb3b348c3da71f9972eb500d6005dc01f1 |
| 2 | |
| 3 | Fixes these errors on x86 |
| 4 | |
| 5 | libavcodec/x86/h264_qpel_mmx.c: Assembler messages: |
| 6 | libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' |
| 7 | libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' |
| 8 | libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' |
| 9 | libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' |
| 10 | libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' |
| 11 | libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' |
| 12 | libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' |
| 13 | make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1 |
| 14 | |
| 15 | |
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 17 | Upstream-Status: Backport |
| 18 | Index: gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c |
| 19 | =================================================================== |
| 20 | --- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 |
| 21 | +++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 |
| 22 | @@ -398,7 +398,7 @@ |
| 23 | "2: \n\t"\ |
| 24 | \ |
| 25 | : "+a"(src), "+c"(dst)\ |
| 26 | - : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ |
| 27 | + : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ |
| 28 | : "memory"\ |
| 29 | );\ |
| 30 | src += 4-(h+5)*srcStride;\ |
| 31 | @@ -446,7 +446,7 @@ |
| 32 | QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ |
| 33 | "2: \n\t"\ |
| 34 | : "+a"(src)\ |
| 35 | - : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ |
| 36 | + : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ |
| 37 | : "memory"\ |
| 38 | );\ |
| 39 | tmp += 4;\ |
| 40 | @@ -823,7 +823,7 @@ |
| 41 | "2: \n\t"\ |
| 42 | \ |
| 43 | : "+a"(src), "+c"(dst)\ |
| 44 | - : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ |
| 45 | + : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ |
| 46 | : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ |
| 47 | "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ |
| 48 | "memory"\ |
| 49 | @@ -878,7 +878,7 @@ |
| 50 | QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) |
| 51 | "2: \n\t" |
| 52 | : "+a"(src) |
| 53 | - : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) |
| 54 | + : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) |
| 55 | : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", |
| 56 | "%xmm4", "%xmm5", "%xmm6", "%xmm7",) |
| 57 | "memory" |