summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Ognibene <luogni@tin.it>2005-05-14 13:19:31 +0000
committerLuca Ognibene <luogni@tin.it>2005-05-14 13:19:31 +0000
commit724361981f72a9af0ce7efef7c6e1b69f7ad8cff (patch)
tree6b082ca5a32d42087ab067c5055a0835b2b13560
parenteea570791cab1a38984707a8382dffd4b7437b71 (diff)
ext/ffmpeg/gstffmpegscale.c (gst_ffmpegscale_change_state): Don't segfault if using passthrough
Original commit message from CVS: * ext/ffmpeg/gstffmpegscale.c (gst_ffmpegscale_change_state): Don't segfault if using passthrough
-rw-r--r--ChangeLog5
-rw-r--r--ext/ffmpeg/gstffmpegscale.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d11522..74d5454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-14 Luca Ognibene <luogni@tin.it>
+
+ * ext/ffmpeg/gstffmpegscale.c (gst_ffmpegscale_change_state):
+ Don't segfault if using passthrough
+
2005-05-13 Luca Ognibene <luogni@tin.it>
* ext/ffmpeg/gstffmpeg.c (plugin_init):
diff --git a/ext/ffmpeg/gstffmpegscale.c b/ext/ffmpeg/gstffmpegscale.c
index 20980d0..db095cf 100644
--- a/ext/ffmpeg/gstffmpegscale.c
+++ b/ext/ffmpeg/gstffmpegscale.c
@@ -397,7 +397,8 @@ gst_ffmpegscale_change_state (GstElement * element)
switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_READY_TO_NULL:
- img_resample_close (scale->res);
+ if (scale->res != NULL)
+ img_resample_close (scale->res);
break;
}