gstreamer/ext
Wim Taymans c3478b2da0 Merge branch 'master' into 0.11
Conflicts:
	ext/vorbis/gstvorbisparse.c
	gst-libs/gst/video/video.c
	gst/videoscale/gstvideoscale.c
	sys/v4l/gstv4lxoverlay.c
	sys/v4l/v4l_calls.c
	sys/v4l/v4lsrc_calls.c
	tests/check/libs/video.c
2012-02-10 15:41:06 +01:00
..
alsa alsa: merge instead of appending structures 2012-01-26 14:28:06 +01:00
cdparanoia Replace deprecated GStaticMutex with GMutex 2012-01-22 22:52:28 +00:00
libvisual port to new map API 2012-01-25 12:30:53 +01:00
ogg Merge branch 'master' into 0.11 2012-02-10 15:41:06 +01:00
pango GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING 2012-02-08 15:17:49 +01:00
theora Merge branch 'master' into 0.11 2012-02-10 15:41:06 +01:00
vorbis Merge branch 'master' into 0.11 2012-02-10 15:41:06 +01:00
Makefile.am gio: Move to gst subdirectory 2012-01-18 16:21:14 +01:00