mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Sebastian Dröge 2012-01-18 10:21:36 +01:00
commit 3393095cd0
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -380,7 +380,7 @@ else
if test -z "$srcdir" -o "$srcdir" = .; then if test -z "$srcdir" -o "$srcdir" = .; then
confcmd=./configure confcmd=./configure
else else
confcmd="$origdir"/"$ac_top_srcdir"/gst-libs/ext/libav/configure confcmd="$ac_abs_top_srcdir"/gst-libs/ext/libav/configure
fi fi
AS_MKDIR_P(["$ac_top_build_prefix"gst-libs/ext/libav]) AS_MKDIR_P(["$ac_top_build_prefix"gst-libs/ext/libav])

8
ext/ffmpeg/gstffmpegdec.c
View file

@ -754,9 +754,11 @@ gst_ffmpegdec_setcaps (GstFFMpegDec * ffmpegdec, GstCaps * caps)
} }
/* set buffer functions */ /* set buffer functions */
ffmpegdec->context->get_buffer = gst_ffmpegdec_get_buffer; if (oclass->in_plugin->type == AVMEDIA_TYPE_VIDEO) {
ffmpegdec->context->release_buffer = gst_ffmpegdec_release_buffer; ffmpegdec->context->get_buffer = gst_ffmpegdec_get_buffer;
ffmpegdec->context->draw_horiz_band = NULL; 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 */ /* default is to let format decide if it needs a parser */
ffmpegdec->turnoff_parser = FALSE; ffmpegdec->turnoff_parser = FALSE;

4
ext/ffmpeg/gstffmpegdemux.c
View file

@ -1296,6 +1296,7 @@ gst_ffmpegdemux_type_find (GstTypeFind * tf, gpointer priv)
in_plugin->name, sinkcaps, res); in_plugin->name, sinkcaps, res);
gst_type_find_suggest (tf, res, sinkcaps); gst_type_find_suggest (tf, res, sinkcaps);
gst_caps_unref (sinkcaps);
} }
} }
} }
@ -1947,7 +1948,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
) )
register_typefind_func = FALSE; 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 demuxers for which we already have another implementation to NONE
* Set All others to NONE*/ * Set All others to NONE*/
if (!strcmp (in_plugin->name, "wsvqa") || if (!strcmp (in_plugin->name, "wsvqa") ||
@ -1955,7 +1956,6 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
!strcmp (in_plugin->name, "wc3movie") || !strcmp (in_plugin->name, "wc3movie") ||
!strcmp (in_plugin->name, "voc") || !strcmp (in_plugin->name, "voc") ||
!strcmp (in_plugin->name, "tta") || !strcmp (in_plugin->name, "tta") ||
!strcmp (in_plugin->name, "swf") ||
!strcmp (in_plugin->name, "sol") || !strcmp (in_plugin->name, "sol") ||
!strcmp (in_plugin->name, "smk") || !strcmp (in_plugin->name, "smk") ||
!strcmp (in_plugin->name, "vmd") || !strcmp (in_plugin->name, "vmd") ||