Wim Taymans
32bd12dba9
Merge branch 'master' into 0.11
Conflicts:
.gitignore
common
configure.ac
ext/vorbis/gstvorbisdeclib.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/riff/riff-read.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkconvertbin.c
tests/check/libs/video.c
2012-03-22 11:35:13 +01:00
..
2012-03-11 19:04:41 +01:00
2012-01-22 22:52:28 +00:00
2012-03-15 22:10:58 +01:00
2012-03-20 13:20:36 +01:00
2012-03-11 19:04:41 +01:00
2012-03-20 13:31:24 +01:00
2012-03-22 11:35:13 +01:00
2012-01-18 16:21:14 +01:00