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
..
2009-05-19 17:50:24 +01:00
2010-02-16 18:05:40 +02:00
2011-08-22 13:06:27 +02:00
2005-08-05 17:13:10 +00:00
2011-08-29 11:37:36 +02:00
2011-08-08 14:12:15 +01:00
2011-07-06 10:27:02 +01:00