Sebastian Dröge d0362c2b87 Merge branch 'master' into 0.11 ... Conflicts: configure.ac ext/alsa/gstalsasrc.c gst-libs/gst/audio/gstbaseaudiosink.c gst-libs/gst/tag/gstxmptag.c gst/playback/gstsubtitleoverlay.c gst/videorate/gstvideorate.c sys/xvimage/xvimagesink.c		2011-05-16 17:06:22 +02:00
..
.gitignore	examples: encoding example	2010-12-15 11:54:32 +01:00
encoding.c	tests: Update for negotiation related API changes	2011-05-16 15:35:41 +02:00
gstcapslist.c	tests: fix unused-but-set-variable warnings with gcc 4.6	2011-04-14 00:24:26 +01:00
gstcapslist.h	examples: encoding example	2010-12-15 11:54:32 +01:00
Makefile.am	encodebin: examples: Add missing base libs to makefile	2011-05-15 13:02:39 -03:00