diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-03 11:34:13 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-03 11:34:13 +0000 |
| commit | 722d9491dd0ea7754db5612db865cc85921b4052 (patch) | |
| tree | 90c64dd49c8a92ca19d2893dd08b0100d81aec2e | |
| parent | 97fd0430f1410e00b0cef36b47a64a9919836105 (diff) | |
configure.ac: scale requires -libs (video.h).
Original commit message from CVS:
* configure.ac:
scale requires -libs (video.h).
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps):
Don't crash if open failed.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegenc.c | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -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); |