diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-06-09 00:05:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:59:15 +0100 |
commit | 6aa3cdd466bbbdf9c5b0a65fa066916aa7c2fc48 (patch) | |
tree | a29f3d781a33a539c4db4a5bd9ad9fe21c291f75 /meta/recipes-multimedia/gstreamer/gstreamer1.0-libav | |
parent | 6e54d3bc95ad906468cf577bc76f8f59866bdd46 (diff) | |
download | poky-6aa3cdd466bbbdf9c5b0a65fa066916aa7c2fc48.tar.gz |
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)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-libav')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch new file mode 100644 index 0000000000..ccadea4d5c --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Description: Workaround to build libav for i586 with gcc 4.9.2 by avoiding memset | ||
2 | Author: Bernhard Übelacker <bernhardu@vr-web.de> | ||
3 | |||
4 | --- | ||
5 | Bug-Debian: https://bugs.debian.org/783082 | ||
6 | Last-Update: 2015-04-28 | ||
7 | |||
8 | Upstream-Status: Backport [debian] | ||
9 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
11 | |||
12 | --- gst-libav-1.4.5.orig/gst-libs/ext/libav/libavcodec/h264_cabac.c | ||
13 | +++ gst-libav-1.4.5/gst-libs/ext/libav/libavcodec/h264_cabac.c | ||
14 | @@ -2020,7 +2020,11 @@ decode_intra_mb: | ||
15 | // In deblocking, the quantizer is 0 | ||
16 | h->cur_pic.qscale_table[mb_xy] = 0; | ||
17 | // All coeffs are present | ||
18 | - memset(h->non_zero_count[mb_xy], 16, 48); | ||
19 | + /*memset(h->non_zero_count[mb_xy], 16, 48);*/ | ||
20 | + /* avoiding this memset because it leads at least with gcc4.9.2 to error: 'asm' operand has impossible constraints */ | ||
21 | + for (size_t i = 0; i < 48; i++) { | ||
22 | + ( (unsigned char*)(h->non_zero_count[mb_xy]) ) [i] = 16; | ||
23 | + } | ||
24 | h->cur_pic.mb_type[mb_xy] = mb_type; | ||
25 | h->last_qscale_diff = 0; | ||
26 | return 0; | ||