Wim Taymans
e1287b97ab
Merge branch 'master' into 0.11
Conflicts:
ext/ogg/gstoggmux.c
gst-libs/gst/audio/audio.c
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/multichannel.h
gst-libs/gst/pbutils/Makefile.am
gst-libs/gst/pbutils/gstdiscoverer.c
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstplaysinkvideoconvert.c
win32/common/libgstaudio.def
2011-08-29 11:37:36 +02:00
..
2010-01-14 10:10:23 +01:00
2011-08-23 20:34:24 +02:00
2011-06-23 18:02:40 +02:00
2011-08-29 11:37:36 +02:00
2011-06-17 15:41:31 +02:00
2011-05-17 11:25:31 +02:00
2009-10-23 17:49:48 -07:00
2010-07-16 17:40:12 +02:00