ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_event)

Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_event)
(gst_ffmpegdec_query):
Get the var before using it :) Fix
segfaults on ffmpeg's event handling

2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a8ad472..9ecca23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-26  Luca Ognibene  <luogni@tin.it>
+
+	* ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_event) 
+	(gst_ffmpegdec_query): 
+	 Get the var before using it :) Fix
+	 segfaults on ffmpeg's event handling
+
 2005-05-18  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ffmpeg/Makefile.am:
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 200ce6e..da89728 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -299,8 +299,8 @@ gst_ffmpegdec_query (GstPad * pad, GstQuery *query)
   GstFormat bfmt;
 
   bfmt = GST_FORMAT_BYTES;
-  peer = GST_PAD_PEER (ffmpegdec->sinkpad);
   ffmpegdec = (GstFFMpegDec *) GST_PAD_PARENT (pad);
+  peer = GST_PAD_PEER (ffmpegdec->sinkpad);
 
   if (!peer)
     goto no_peer;
@@ -335,12 +335,12 @@ gst_ffmpegdec_event (GstPad * pad, GstEvent * event)
   GstFFMpegDec *ffmpegdec;
   GstPad *peer;
   
-  peer = GST_PAD_PEER (ffmpegdec->sinkpad);
   ffmpegdec = (GstFFMpegDec *) GST_PAD_PARENT (pad);
+  peer = GST_PAD_PEER (ffmpegdec->sinkpad);
 
   if (!peer)
     return FALSE;
-
+  
   gst_event_ref (event);
   if (gst_pad_send_event (peer, event)) {
     gst_event_unref (event);