Wim Taymans e1287b97ab Merge branch 'master' into 0.11 ... Conflicts: ext/ogg/gstoggmux.c gst-libs/gst/audio/audio.c gst-libs/gst/audio/audio.h gst-libs/gst/audio/multichannel.h gst-libs/gst/pbutils/Makefile.am gst-libs/gst/pbutils/gstdiscoverer.c gst/playback/gstplaysinkaudioconvert.c gst/playback/gstplaysinkvideoconvert.c win32/common/libgstaudio.def		2011-08-29 11:37:36 +02:00
..
.gitignore
gstdecodebin.c	decodebin: don't plug the same parser multiple times in a row	2011-07-15 16:14:11 +01:00
gstdecodebin2.c	Merge branch 'master' into 0.11	2011-08-16 18:01:14 +02:00
gstplay-enum.c
gstplay-enum.h	some more ffmpegcolorspace to videoconvert changes	2011-06-15 18:08:32 +02:00
gstplay-marshal.list	uridecodebin, decodebin: remove new-decoded-pad and removed-decoded-pad signals	2011-06-15 00:32:23 +01:00
gstplayback.c	playback: merge playbin and decodebin plugins into one single playback plugin again	2011-06-15 00:02:13 +01:00
gstplayback.h	playback: merge playbin and decodebin plugins into one single playback plugin again	2011-06-15 00:02:13 +01:00
gstplaybin2.c	Merge branch 'master' into 0.11	2011-08-16 18:01:14 +02:00
gstplaysink.c	Merge branch 'master' into 0.11	2011-08-29 11:37:36 +02:00
gstplaysink.h
gstplaysinkaudioconvert.c	Merge branch 'master' into 0.11	2011-08-29 11:37:36 +02:00
gstplaysinkaudioconvert.h
gstplaysinkvideoconvert.c	Merge branch 'master' into 0.11	2011-08-29 11:37:36 +02:00
gstplaysinkvideoconvert.h
gstrawcaps.h	audio: rework audio caps.	2011-08-18 19:15:03 +02:00
gststreamselector.c
gststreamselector.h
gststreamsynchronizer.c	gststreamsynchronizer: don't abuse PREROLL flag	2011-08-15 18:38:04 +02:00
gststreamsynchronizer.h
gstsubtitleoverlay.c	video: add colorimetry info	2011-08-23 18:57:35 +02:00
gstsubtitleoverlay.h
gsturidecodebin.c	ext,gst: update for query API changes	2011-07-27 01:16:53 +01:00
Makefile.am	playback: merge playbin and decodebin plugins into one single playback plugin again	2011-06-15 00:02:13 +01:00