From 9b7bd04ad99ccbec35d464891bba35d350e23e9d Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Thu, 27 Jan 2011 22:25:13 +0100 Subject: configure.ac: improve path handling in out-of-tree build That is, handle the srcdir being given by a relative path as well as an absolute path by using autotools provided absolute path. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6756f0a..ab03994 100644 --- a/configure.ac +++ b/configure.ac @@ -379,7 +379,7 @@ else if test -z "$srcdir" -o "$srcdir" = .; then confcmd=./configure else - confcmd="$origdir"/"$ac_top_srcdir"/gst-libs/ext/libav/configure + confcmd="$ac_abs_top_srcdir"/gst-libs/ext/libav/configure fi AS_MKDIR_P(["$ac_top_build_prefix"gst-libs/ext/libav]) -- cgit v1.2.3 From 49e3bc6e35e2fc3846a5f5ba9232bbdae665b1cd Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Thu, 12 Jan 2012 14:57:48 +0000 Subject: ffmpegdemux: fix caps leak --- ext/ffmpeg/gstffmpegdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index 3eb5328..6122a40 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -1330,6 +1330,7 @@ gst_ffmpegdemux_type_find (GstTypeFind * tf, gpointer priv) in_plugin->name, sinkcaps, res); gst_type_find_suggest (tf, res, sinkcaps); + gst_caps_unref (sinkcaps); } } } -- cgit v1.2.3 From c84802ffef3ee9248ffe4f757a8f5bdf455faef2 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Thu, 12 Jan 2012 18:03:10 +0000 Subject: ffmpegdemux: demote swf demuxer to GST_RANK_NONE SWF doesn't really make sense in our context, don't pretend to support it. People should use a dedicated swf player for that. --- ext/ffmpeg/gstffmpegdemux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index 6122a40..82e61c9 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -1959,7 +1959,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin) ) register_typefind_func = FALSE; - /* Set the rank of demuxers know to work to MARGINAL. + /* Set the rank of demuxers known to work to MARGINAL. * Set demuxers for which we already have another implementation to NONE * Set All others to NONE*/ if (!strcmp (in_plugin->name, "wsvqa") || @@ -1967,7 +1967,6 @@ gst_ffmpegdemux_register (GstPlugin * plugin) !strcmp (in_plugin->name, "wc3movie") || !strcmp (in_plugin->name, "voc") || !strcmp (in_plugin->name, "tta") || - !strcmp (in_plugin->name, "swf") || !strcmp (in_plugin->name, "sol") || !strcmp (in_plugin->name, "smk") || !strcmp (in_plugin->name, "vmd") || -- cgit v1.2.3 From 99d47920144f08f7efd0ca03ec5ab583046c496d Mon Sep 17 00:00:00 2001 From: Sebastian Dröge Date: Wed, 18 Jan 2012 10:05:09 +0100 Subject: ffdec: Only set get_buffer() function for video Fixes bug #666435. --- ext/ffmpeg/gstffmpegdec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index db02a69..fa2e2f4 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -766,9 +766,11 @@ gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps) } /* set buffer functions */ - ffmpegdec->context->get_buffer = gst_ffmpegdec_get_buffer; - ffmpegdec->context->release_buffer = gst_ffmpegdec_release_buffer; - ffmpegdec->context->draw_horiz_band = NULL; + if (oclass->in_plugin->type == AVMEDIA_TYPE_VIDEO) { + ffmpegdec->context->get_buffer = gst_ffmpegdec_get_buffer; + ffmpegdec->context->release_buffer = gst_ffmpegdec_release_buffer; + ffmpegdec->context->draw_horiz_band = NULL; + } /* default is to let format decide if it needs a parser */ ffmpegdec->turnoff_parser = FALSE; -- cgit v1.2.3