Wim Taymans 7012e88090 Merge branch 'master' into 0.11 ... Conflicts: gst-libs/gst/audio/audio.h gst-libs/gst/audio/gstaudiodecoder.c gst-libs/gst/audio/gstaudiodecoder.h gst-libs/gst/audio/gstaudioencoder.c gst-libs/gst/audio/gstbaseaudioencoder.h gst/playback/Makefile.am gst/playback/gstplaybin.c gst/playback/gstplaysink.c gst/playback/gstplaysinkvideoconvert.c gst/playback/gstsubtitleoverlay.c gst/videorate/gstvideorate.c gst/videoscale/gstvideoscale.c win32/common/libgstaudio.def		2011-09-06 15:24:32 +02:00
..
app	-base: update for buffer API change	2011-06-13 16:32:56 +02:00
audio	Merge branch 'master' into 0.11	2011-06-10 12:14:57 +02:00
dynamic	ffmpegcolorspace -> videoconvert	2011-07-07 23:59:59 +01:00
encoding	Merge branch 'master' into 0.11	2011-05-16 17:06:22 +02:00
gio	message: don't acces the structure directly	2011-05-10 13:35:49 +02:00
overlay	tests: fix libs order in some makefiles	2011-08-08 14:16:39 +01:00
playrec	tests: fix unused-but-set-variable warnings with gcc 4.6	2011-04-14 00:24:26 +01:00
seek	Merge branch 'master' into 0.11	2011-09-06 15:24:32 +02:00
snapshot	tests: update for query API changes	2011-07-27 01:18:19 +01:00
volume	build: use LDADD instead of LDFLAGS to specify libs to link to when building executables	2010-04-14 14:08:15 +01:00
Makefile.am	Merge branch 'master' into 0.11	2011-06-17 15:48:19 +02:00