From 355b3721d914dccf8e07159297a81bd8bd342c02 Mon Sep 17 00:00:00 2001
From: Barun Kumar Singh <barun.singh@samsung.com>
Date: Thu, 16 Jul 2015 13:35:44 +0530
Subject: [PATCH] Fixing "g_ptr_array_set_size" crash. Increasing omx elements
 priority. Signed-off-by: Barun Kumar Singh <barun.singh@samsung.com>
 Change-Id: I388fa4d7bd3da9c60ed30fd4659815e5356a011b

---
 config/odroid/gstomx.conf | 14 +++++++-------
 omx/gstomxvideodec.c      |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/config/odroid/gstomx.conf b/config/odroid/gstomx.conf
index 571e378..0106ef2 100755
--- a/config/odroid/gstomx.conf
+++ b/config/odroid/gstomx.conf
@@ -2,7 +2,7 @@
 type-name=GstOMXMPEG2VideoDec
 core-name=/usr/lib/libExynosOMX_Core.so
 component-name=OMX.Exynos.MPEG2.Decoder
-rank=256
+rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role
@@ -11,7 +11,7 @@ hacks=no-component-role
 type-name=GstOMXMPEG4VideoDec
 core-name=/usr/lib/libExynosOMX_Core.so
 component-name=OMX.Exynos.MPEG4.Decoder
-rank=256
+rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role
@@ -20,7 +20,7 @@ hacks=no-component-role
 type-name=GstOMXH263Dec
 core-name=/usr/lib/libExynosOMX_Core.so
 component-name=OMX.Exynos.H263.Decoder
-rank=256
+rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role
@@ -29,7 +29,7 @@ hacks=no-component-role
 type-name=GstOMXH264Dec
 core-name=/usr/lib/libExynosOMX_Core.so
 component-name=OMX.Exynos.AVC.Decoder
-rank=257
+rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role
@@ -48,7 +48,7 @@ sink-template-caps=video/x-wmv,wmvversion=(int)3,format=(string){WMV3,WVC1},widt
 type-name=GstOMXH264Enc
 core-name=/usr/lib/libExynosOMX_Core.so
 component-name=OMX.Exynos.AVC.Encoder
-rank=257
+rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role
@@ -57,7 +57,7 @@ hacks=no-component-role
 type-name=GstOMXMPEG4VideoEnc
 core-name=/usr/lib/libExynosOMX_Core.so
 component-name=OMX.Exynos.MPEG4.Encoder
-rank=254
+rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role
@@ -66,7 +66,7 @@ hacks=no-component-role
 type-name=GstOMXH263Enc
 core-name=/usr/lib/libExynosOMX_Core.so
 component-name=OMX.Exynos.H263.Encoder
-rank=254
+rank=258
 in-port-index=0
 out-port-index=1
 hacks=no-component-role
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index c8600ed..fa6ba79 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -269,7 +269,8 @@ gst_omx_buffer_pool_stop (GstBufferPool * bpool)
   GstOMXBufferPool *pool = GST_OMX_BUFFER_POOL (bpool);
 
   /* Remove any buffers that are there */
-  g_ptr_array_set_size (pool->buffers, 0);
+  if(pool->buffers)
+      g_ptr_array_set_size (pool->buffers, 0);
 
   if (pool->caps)
     gst_caps_unref (pool->caps);
-- 
2.7.4