diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-18 10:21:36 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-18 10:21:36 +0100 |
| commit | 3393095cd0d95ba0243bb243e504d4cd1b47b23b (patch) | |
| tree | fb8904d647e1548d9006d23244642145d4889548 | |
| parent | 0edb9f22f0a1ee0479f3ed548e9983c7acdb1ce8 (diff) | |
| parent | 99d47920144f08f7efd0ca03ec5ab583046c496d (diff) | |
Merge branch 'master' into 0.11
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 8 | ||||
| -rw-r--r-- | ext/ffmpeg/gstffmpegdemux.c | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index a02033e..bbb7413 100644 --- a/configure.ac +++ b/configure.ac @@ -380,7 +380,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]) diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 0d9225f..cbcde22 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -754,9 +754,11 @@ gst_ffmpegdec_setcaps (GstFFMpegDec * ffmpegdec, 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; diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index cf96163..0131737 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -1296,6 +1296,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); } } } @@ -1947,7 +1948,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") || @@ -1955,7 +1956,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") || |