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

..

gstbasetextoverlay.c

Merge branch 'master' into 0.11

2011-09-23 18:27:11 +02:00

gstbasetextoverlay.h

-base: port to GstVideoFrame API

2011-06-17 15:41:31 +02:00

gstclockoverlay.c

ffmpegcolorspace -> videoconvert

2011-07-07 23:59:59 +01:00

gstclockoverlay.h

pango: Create a new base class for all the elements

2011-04-16 15:56:55 +02:00

gsttextoverlay.c

textoverlay: Protect against accessing the NULL parent of the pads during shutdown

2011-09-19 09:34:08 +02:00

gsttextoverlay.h

textoverlay: added 'outline-color' parameter to control whether text gets a shadow

2011-05-26 11:05:43 +02:00

gsttextrender.c

Fix debug statements

2011-08-10 11:15:41 +02:00

gsttextrender.h

pango: Use pango-cairo instead of pango-ft2

2009-08-06 06:43:36 +02:00

gsttimeoverlay.c

ext: Use G_DEFINE_TYPE instead of GST_BOILERPLATE

2011-04-19 14:22:42 +02:00

gsttimeoverlay.h

pango: Create a new base class for all the elements

2011-04-16 15:56:55 +02:00

Makefile.am

Merge branch 'master' into 0.11

2011-06-10 12:14:57 +02:00