From 724361981f72a9af0ce7efef7c6e1b69f7ad8cff Mon Sep 17 00:00:00 2001 From: Luca Ognibene Date: Sat, 14 May 2005 13:19:31 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ ext/ffmpeg/gstffmpegscale.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4d1152260c..74d54543f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-05-14 Luca Ognibene + + * ext/ffmpeg/gstffmpegscale.c (gst_ffmpegscale_change_state): + Don't segfault if using passthrough + 2005-05-13 Luca Ognibene * ext/ffmpeg/gstffmpeg.c (plugin_init): diff --git a/ext/ffmpeg/gstffmpegscale.c b/ext/ffmpeg/gstffmpegscale.c index 20980d0577..db095cfc44 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; }