mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	ext/pango/gsttextoverlay.c
	gst/encoding/gstencodebin.c
This commit is contained in:
Wim Taymans 2011-10-03 10:11:19 +02:00
commit e787c7a5e2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/encoding/gstencodebin.c
View file

@ -1063,7 +1063,7 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof,
* if the muxer isn't a formatter and doesn't implement the tagsetter interface * if the muxer isn't a formatter and doesn't implement the tagsetter interface
*/ */
if (!ebin->muxer || (!GST_IS_TAG_SETTER (ebin->muxer) if (!ebin->muxer || (!GST_IS_TAG_SETTER (ebin->muxer)
|| !_has_class (ebin->muxer, "Formatter"))) { && !_has_class (ebin->muxer, "Formatter"))) {
sgroup->formatter = _get_formatter (ebin, sprof); sgroup->formatter = _get_formatter (ebin, sprof);
if (sgroup->formatter) { if (sgroup->formatter) {
GST_DEBUG ("Adding formatter for %" GST_PTR_FORMAT, format); GST_DEBUG ("Adding formatter for %" GST_PTR_FORMAT, format);
@ -1262,7 +1262,7 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof,
/* FIXME : Once we have properties for specific converters, use those */ /* FIXME : Once we have properties for specific converters, use those */
if (GST_IS_ENCODING_VIDEO_PROFILE (sprof)) { if (GST_IS_ENCODING_VIDEO_PROFILE (sprof)) {
const gboolean native_video = const gboolean native_video =
!!(ebin->flags & GST_ENC_FLAG_NO_VIDEO_CONVERSION); ! !(ebin->flags & GST_ENC_FLAG_NO_VIDEO_CONVERSION);
GstElement *cspace = NULL, *scale, *vrate, *cspace2 = NULL; GstElement *cspace = NULL, *scale, *vrate, *cspace2 = NULL;
GST_LOG ("Adding conversion elements for video stream"); GST_LOG ("Adding conversion elements for video stream");