1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00

gstreamer1.0-libav: fix build for i586 with gcc

Backport a patch from debian to fix the build for i586 with gcc, the
patch is similar to libav's
workaround-to-build-libav-for-i586-with-gcc.patch.

(From OE-Core rev: 186df51c49987b44bfcf21d133ad9fe80f0790bb)

(From OE-Core rev: 99ce2b9624f35f0e775dc9559b04322ae8e08bfc)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2015-06-09 00:05:02 -07:00
committed by Richard Purdie
parent 4a2af0eaa9
commit 3746f83469
2 changed files with 27 additions and 0 deletions
@@ -0,0 +1,26 @@
Description: Workaround to build libav for i586 with gcc 4.9.2 by avoiding memset
Author: Bernhard Übelacker <bernhardu@vr-web.de>
---
Bug-Debian: https://bugs.debian.org/783082
Last-Update: 2015-04-28
Upstream-Status: Backport [debian]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- gst-libav-1.4.5.orig/gst-libs/ext/libav/libavcodec/h264_cabac.c
+++ gst-libav-1.4.5/gst-libs/ext/libav/libavcodec/h264_cabac.c
@@ -2020,7 +2020,11 @@ decode_intra_mb:
// In deblocking, the quantizer is 0
h->cur_pic.qscale_table[mb_xy] = 0;
// All coeffs are present
- memset(h->non_zero_count[mb_xy], 16, 48);
+ /*memset(h->non_zero_count[mb_xy], 16, 48);*/
+ /* avoiding this memset because it leads at least with gcc4.9.2 to error: 'asm' operand has impossible constraints */
+ for (size_t i = 0; i < 48; i++) {
+ ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16;
+ }
h->cur_pic.mb_type[mb_xy] = mb_type;
h->last_qscale_diff = 0;
return 0;
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = " \
http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
"
SRC_URI[md5sum] = "f4922a46adbcbe7bd01331ff5dc7979d"
SRC_URI[sha256sum] = "605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc"