From 78c73a27b7bab1ca8e68d0a0963c021e29cfafdd Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
Date: Sat, 19 Jan 2002 18:46:23 +0000
Subject: Drop the bytstream correctly.

Original commit message from CVS:
Drop the bytstream correctly.
---
 gst/flx/gstflxdec.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'gst')

diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index d04a3110..871e8ab7 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -472,6 +472,11 @@ gst_flxdec_loop (GstElement *element)
   if (flxdec->state == GST_FLXDEC_READ_HEADER) {
     databuf = flx_get_data(flxdec, FlxHeaderSize);
 
+    if (!databuf) {
+      g_print ("empty buffer\n");
+      return;
+    }
+
     data = GST_BUFFER_DATA(databuf);
 
     memcpy((char *) &flxdec->hdr, data, sizeof(FlxHeader));
@@ -483,8 +488,10 @@ gst_flxdec_loop (GstElement *element)
     /* check header */
     if (flxh->type != FLX_MAGICHDR_FLI &&
       flxh->type != FLX_MAGICHDR_FLC &&
-      flxh->type != FLX_MAGICHDR_FLX) 
+      flxh->type != FLX_MAGICHDR_FLX) {
+      gst_element_error (element, "not a flx file (type %d)\n", flxh->type);
       return;
+    }
   
   
     g_print("GstFlxDec:       size      :  %d\n", flxh->size);
@@ -607,9 +614,9 @@ gst_flxdec_change_state (GstElement *element)
 
   switch (GST_STATE_TRANSITION (element)) {
     case GST_STATE_NULL_TO_READY:
-      flxdec->bs = gst_bytestream_new (flxdec->sinkpad);
       break;
     case GST_STATE_READY_TO_PAUSED:
+      flxdec->bs = gst_bytestream_new (flxdec->sinkpad);
       flxdec->state = GST_FLXDEC_READ_HEADER;
       break;
     case GST_STATE_PAUSED_TO_PLAYING:
@@ -621,9 +628,9 @@ gst_flxdec_change_state (GstElement *element)
       flxdec->frame = NULL;
       gst_buffer_unref (flxdec->delta);
       flxdec->delta = NULL;
+      gst_bytestream_destroy (flxdec->bs);
       break;
     case GST_STATE_READY_TO_NULL:
-      gst_bytestream_destroy (flxdec->bs);
       break;
   }
   
-- 
cgit