Wim Taymans 33467d9629 Merge branch 'master' into 0.11 ... Conflicts: configure.ac ext/pango/gsttextoverlay.c ext/theora/gsttheoradec.c gst/adder/gstadder.c gst/adder/gstadder.h gst/audioresample/gstaudioresample.c gst/encoding/gstencodebin.c gst/playback/gstdecodebin.c gst/playback/gstdecodebin2.c tests/check/elements/decodebin2.c tests/check/elements/playbin-compressed.c win32/common/libgsttag.def		2011-08-16 18:01:14 +02:00
..
.gitignore	gst: New encoding plugin	2010-12-15 11:54:32 +01:00
gstencode-marshal.list	gst: New encoding plugin	2010-12-15 11:54:32 +01:00
gstencodebin.c	Merge branch 'master' into 0.11	2011-08-16 18:01:14 +02:00
gstencodebin.h	encodebin: Add missing-plugin support	2011-01-07 13:18:20 +01:00
gstsmartencoder.c	-base: fix for flush_stop event API change	2011-06-10 11:59:53 +02:00
gstsmartencoder.h	gst: New encoding plugin	2010-12-15 11:54:32 +01:00
gststreamcombiner.c	-base: use caps event instead of setcapsfunction	2011-06-07 10:58:27 +02:00
gststreamcombiner.h	gst: New encoding plugin	2010-12-15 11:54:32 +01:00
gststreamsplitter.c	Merge branch 'master' into 0.11	2011-07-07 11:10:39 +02:00
gststreamsplitter.h	gst: New encoding plugin	2010-12-15 11:54:32 +01:00
Makefile.am	android: make it ready for androgenizer	2011-04-11 07:23:21 +02:00