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
..
elements	GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING	2012-02-08 15:17:49 +01:00
generic	playback, mixerutils: gst_registry_get_default() -> gst_registry_get()	2012-01-02 14:32:11 +00:00
gst	port to new map API	2012-01-25 12:30:53 +01:00
libs	Merge branch 'master' into 0.11	2012-02-10 15:41:06 +01:00
pipelines	update for HEADER flag changes	2012-01-30 17:16:17 +01:00
.gitignore	Ignore registries in any format.	2007-09-19 18:16:58 +00:00
gst-plugins-base.supp	valgrind: add ALSA leaks fixed by snd_config_update_free_global	2011-11-07 12:20:12 +00:00
Makefile.am	tests: fix some tests	2012-01-19 15:32:52 +01:00