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
..
2010-12-13 09:59:37 +02:00
2011-09-23 18:27:11 +02:00
2010-12-15 11:54:32 +01:00
2010-06-26 12:39:34 +01:00
2010-03-08 11:16:56 +01:00
2011-08-22 15:57:30 +02:00
2009-08-07 13:05:42 +02:00
2010-12-15 11:54:32 +01:00
2011-04-06 16:11:02 +02:00
2008-05-21 11:52:30 +00:00