gstreamer/gst/typefind
Edward Hervey 17bfba09f1 Merge branch 'master' into 0.11
Conflicts:
	ext/ogg/gstoggdemux.c
	ext/pango/gsttextoverlay.c
	gst-libs/gst/audio/gstaudioencoder.c
	gst-libs/gst/audio/gstbaseaudiosrc.c
	gst/playback/gstsubtitleoverlay.c
	gst/videorate/gstvideorate.c
2011-09-23 18:27:11 +02:00
..
gsttypefindfunctions.c Merge branch 'master' into 0.11 2011-09-23 18:27:11 +02:00
Makefile.am android: make it ready for androgenizer 2011-04-11 07:23:21 +02:00
typefindfunctions.vcproj more working plugins 2004-07-27 21:41:30 +00:00