Wim Taymans
7ac25e9b26
Merge branch 'master' into 0.11
Conflicts:
common
configure.ac
gst-libs/gst/audio/gstbaseaudiosink.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstplaysinkaudioconvert.h
gst/playback/gstplaysinkvideoconvert.c
gst/playback/gstplaysinkvideoconvert.h
2011-11-07 12:23:15 +01:00
..
2010-12-13 09:59:37 +02:00
2011-11-04 13:01:52 +01:00
2011-11-04 13:01:52 +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
2011-11-02 23:35:15 +00: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