changeset 6439:04b694f43543

RT-36058: segfault when streaming mp3
author Kirill Kirichenko <kirill.kirichenko@oracle.com>
date Fri, 07 Mar 2014 17:11:19 +0400
parents 050af50b4a0e
children d3e5f81ba638
files modules/media/src/main/native/gstreamer/plugins/progressbuffer/progressbuffer.c modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/modules/media/src/main/native/gstreamer/plugins/progressbuffer/progressbuffer.c	Fri Mar 07 17:09:31 2014 +0400
+++ b/modules/media/src/main/native/gstreamer/plugins/progressbuffer/progressbuffer.c	Fri Mar 07 17:11:19 2014 +0400
@@ -778,7 +778,7 @@
     gst_buffer_unref(data);
 
     // Here we can maintain some prebuffering strategy.
-    if (!element->srcpad)
+    if (result != GST_FLOW_ERROR && !element->srcpad)
         progress_buffer_create_sourcepad(element);
 
     return result;
--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	Fri Mar 07 17:09:31 2014 +0400
+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	Fri Mar 07 17:11:19 2014 +0400
@@ -14,7 +14,6 @@
 
 TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
 
-OFLAGS = -Os
 CFLAGS = -fPIC                   \
          -Werror=implicit-function-declaration \
          -msse2                  \