diff --git a/ChangeLog b/ChangeLog
index 8f2e154757..27ee68203c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-03  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* configure.ac:
+	  scale requires -libs (video.h).
+	* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps):
+	  Don't crash if open failed.
+
 2005-05-24  Luca Ognibene  <luogni@tin.it>
 
 	* ext/ffmpeg/gstffmpegdeinterlace.c (gst_ffmpegdeinterlace_chain): 
diff --git a/configure.ac b/configure.ac
index 9ff07fa92b..ea31ad5ee7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,8 @@ AC_HEADER_STDC([])
 
 
 dnl check for gstreamer; uninstalled is selected preferentially -- see pkg-config(1)
-PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ,
+PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ \
+		       gstreamer-libs-$GST_MAJORMINOR,
   HAVE_GST="yes", HAVE_GST="no")
                                                                                 
 if test "x$HAVE_GST" = "xno"; then
diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index ca1142368f..0461c9fb1d 100644
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -333,6 +333,8 @@ gst_ffmpegenc_getcaps (GstPad * pad)
           gst_ffmpeg_codectype_to_caps (oclass->in_plugin->type, ctx));
       avcodec_close (ctx);
     }
+    if (ctx->priv_data)
+      avcodec_close (ctx);
   }
   av_free (ctx);