diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:06:25 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:27 +0100 |
commit | ee14710dbf1c4383ca20851529684f164883cc80 (patch) | |
tree | 0416d475b383deef152811659b24bcfa7c40e4da /meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch | |
parent | d4ad1b760d0112d0b0823c59da21cc50f6efdda6 (diff) | |
download | poky-ee14710dbf1c4383ca20851529684f164883cc80.tar.gz |
qt-mobility: move qt-mobility patches to separate dir
(From OE-Core rev: 8dccc55a623f0c5f3469c7cdf63aa788683aa186)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch')
-rw-r--r-- | meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch b/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch deleted file mode 100644 index 2df76fc778..0000000000 --- a/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Upstream-Status: Submitted [QTMOBILITY-1611] | ||
2 | |||
3 | From b308508b49afa9a129b4e4589c57cd107d1320b8 Mon Sep 17 00:00:00 2001 | ||
4 | From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | ||
5 | Date: Fri, 6 May 2011 10:35:11 +1000 | ||
6 | Subject: [PATCH] gstvideoconnector: fixed buffers allocation | ||
7 | |||
8 | It should not be necessary, but at least theora video decoder doesn't | ||
9 | iniatilize *buf, while gst_pad_alloc_buffer relies on buf being NULL. | ||
10 | |||
11 | Task-number: QTMOBILITY-1611 | ||
12 | Reviewed-by: Michael Goddard | ||
13 | --- | ||
14 | plugins/multimedia/gstreamer/gstvideoconnector.c | 4 ++++ | ||
15 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
16 | |||
17 | diff --git a/plugins/multimedia/gstreamer/gstvideoconnector.c b/plugins/multimedia/gstreamer/gstvideoconnector.c | ||
18 | index ddf68e0..9f8ceae 100644 | ||
19 | --- a/plugins/multimedia/gstreamer/gstvideoconnector.c | ||
20 | +++ b/plugins/multimedia/gstreamer/gstvideoconnector.c | ||
21 | @@ -186,6 +186,10 @@ gst_video_connector_buffer_alloc (GstPad * pad, guint64 offset, guint size, | ||
22 | GstFlowReturn res = GST_FLOW_OK; | ||
23 | element = GST_VIDEO_CONNECTOR (GST_PAD_PARENT (pad)); | ||
24 | |||
25 | + if (!buf) | ||
26 | + return GST_FLOW_ERROR; | ||
27 | + *buf = NULL; | ||
28 | + | ||
29 | GST_OBJECT_LOCK (element); | ||
30 | gst_object_ref(element->srcpad); | ||
31 | GST_OBJECT_UNLOCK (element); | ||
32 | -- | ||
33 | 1.7.4.1 | ||
34 | |||