Commit graph

7 commits

Author SHA1 Message Date
Sebastian Dröge
a2a4300241 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
	ext/kate/gstkateenc.c
	gst/colorspace/colorspace.c
	gst/mpegvideoparse/mpegvideoparse.c
2012-01-25 13:22:43 +01:00
David Schleef
96f7c5374f inter: Fix compilation
Fix up previously botched rebase.
2012-01-22 16:55:46 -08:00
David Schleef
4eb4602746 inter: Add channel property 2012-01-22 15:52:15 -08:00
Tim-Philipp Müller
699677ed8a Merge remote-tracking branch 'origin/master' into 0.11 2012-01-13 00:11:54 +00:00
Vincent Penquerc'h
a940c6a84d inter: remove (leaking) dead code 2012-01-12 16:48:38 +00:00
Vincent Penquerc'h
7521b597f4 various: fix pad template ref leaks
https://bugzilla.gnome.org/show_bug.cgi?id=662664
2011-11-28 13:08:27 +00:00
David Schleef
e9f0e27596 inter: new intermediate surface plugin
This set of elements allows easily rendering audio and video to
an intermediate surface that is then used as a source in a different
pipeline.
2011-07-04 16:47:50 -07:00