diff options
author | Wang Zidan <b50113@freescale.com> | 2014-07-22 14:49:20 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-23 21:59:14 +0100 |
commit | 4fc9259563a5cd8d990ae1da165dd24898bff08e (patch) | |
tree | 31422da237c71a091098070a8693be3255166be1 /meta/recipes-multimedia/gstreamer | |
parent | 036d9aba2090d12936758be4ff62165a69975cd6 (diff) | |
download | poky-4fc9259563a5cd8d990ae1da165dd24898bff08e.tar.gz |
gstreamer: fix a bug for gstbaseparse
self-comparison will always evaluates to true.
(From OE-Core rev: ecd6764843f1bb3a8eeb8580db9e22231ec3c94d)
Signed-off-by: Wang Zidan <b50113@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch | 32 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb | 4 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch new file mode 100644 index 0000000000..d07749682b --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From ed7f4802222234eef192aa3f74bc92268f338f97 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sebastian Droege <sebastian.droege@collabora.co.uk> | ||
3 | Date: Tue, 6 Mar 2012 12:28:02 +0100 | ||
4 | Subject: [PATCH] baseparse: Fix 'self-comparison always evaluates to true' | ||
5 | |||
6 | This was really a bug. | ||
7 | |||
8 | Commit is ed7f4802222234eef192aa3f74bc92268f338f97 in 0.10 branch | ||
9 | |||
10 | Upstream Status: Backported | ||
11 | |||
12 | Signed-off-by: Sebastian Droege <sebastian.droege@collabora.co.uk> | ||
13 | --- | ||
14 | libs/gst/base/gstbaseparse.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c | ||
18 | index 851ec1d..108ee89 100644 | ||
19 | --- a/libs/gst/base/gstbaseparse.c | ||
20 | +++ b/libs/gst/base/gstbaseparse.c | ||
21 | @@ -3899,7 +3899,7 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event) | ||
22 | seek event (in bytes) to upstream. Segment / flush handling happens | ||
23 | in corresponding src event handlers */ | ||
24 | GST_DEBUG_OBJECT (parse, "seek in PUSH mode"); | ||
25 | - if (seekstop >= 0 && seekpos <= seekpos) | ||
26 | + if (seekstop >= 0 && seekstop <= seekpos) | ||
27 | seekstop = seekpos; | ||
28 | new_event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, | ||
29 | GST_SEEK_TYPE_SET, seekpos, stop_type, seekstop); | ||
30 | -- | ||
31 | 1.7.9.5 | ||
32 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb index 99eee81761..f08908a216 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb | |||
@@ -13,7 +13,9 @@ PR = "r2" | |||
13 | 13 | ||
14 | SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ | 14 | SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ |
15 | file://check_fix.patch \ | 15 | file://check_fix.patch \ |
16 | file://gst-inspect-check-error.patch" | 16 | file://gst-inspect-check-error.patch \ |
17 | file://0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch \ | ||
18 | " | ||
17 | 19 | ||
18 | SRC_URI[md5sum] = "a0cf7d6877f694a1a2ad2b4d1ecb890b" | 20 | SRC_URI[md5sum] = "a0cf7d6877f694a1a2ad2b4d1ecb890b" |
19 | SRC_URI[sha256sum] = "e556a529e0a8cf1cd0afd0cab2af5488c9524e7c3f409de29b5d82bb41ae7a30" | 21 | SRC_URI[sha256sum] = "e556a529e0a8cf1cd0afd0cab2af5488c9524e7c3f409de29b5d82bb41ae7a30" |