diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-06-20 16:52:30 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-06-20 16:52:30 +0200 |
commit | 97af9b54157142f500c0322b49e669d893768850 (patch) | |
tree | e19216da2dc490aa5504c6dd45b2983c4633bc9f /recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0015-basetextoverlay-need-avoid-idx-exceed-me.patch | |
parent | 1ea27c0e94885dfe703dafd49fe42a40a180554a (diff) |
Revert "imx-gst1.0-plugin: Add v4.3.1 and NXP specific gstreamer1.0 patches"
This resp. a later version got recently pulled into the rocko branch of
meta-freescale.
This reverts commit 5faa79028eead21680d490a1b589a3875f966e0e.
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0015-basetextoverlay-need-avoid-idx-exceed-me.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0015-basetextoverlay-need-avoid-idx-exceed-me.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0015-basetextoverlay-need-avoid-idx-exceed-me.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0015-basetextoverlay-need-avoid-idx-exceed-me.patch deleted file mode 100644 index 5fdc93c..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0015-basetextoverlay-need-avoid-idx-exceed-me.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f11ab0f14638d21b6e48bff3fd63aaaa0689f21d Mon Sep 17 00:00:00 2001 -From: Haihua Hu <jared.hu@nxp.com> -Date: Thu, 30 Nov 2017 17:43:20 +0800 -Subject: [PATCH] [MMFMWK-7786] basetextoverlay: need avoid idx exceed memory - block number - -when check whether video buffer is read only, the gst_buffer_get_memory call -should make sure idx don't exceed the total memory block number - -Upstream-Status: Inappropriate [i.MX specific] - -Signed-off-by: Haihua Hu <jared.hu@nxp.com> ---- - ext/pango/gstbasetextoverlay.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ext/pango/gstbasetextoverlay.c b/ext/pango/gstbasetextoverlay.c -index 7e32904..d2bbbee 100755 ---- a/ext/pango/gstbasetextoverlay.c -+++ b/ext/pango/gstbasetextoverlay.c -@@ -2248,7 +2248,9 @@ gst_base_text_overlay_push_frame (GstBaseTextOverlay * overlay, - gboolean mem_rdonly = FALSE; - GstMemory *mem; - -- while (mem = gst_buffer_get_memory(video_frame, idx++)) { -+ gint n_mem = gst_buffer_n_memory (video_frame); -+ -+ while (idx < n_mem && (mem = gst_buffer_get_memory(video_frame, idx++))) { - if (GST_MEMORY_IS_READONLY(mem)) { - gst_memory_unref (mem); - mem_rdonly = TRUE; --- -1.9.1 - |