Wim Taymans 01b9b5002f Merge branch 'master' into 0.11 ... Conflicts: common configure.ac gst/colorspace/colorspace.c gst/colorspace/colorspace.h gst/colorspace/gstcolorspace.c		2011-08-04 09:36:07 +02:00
..
gstsdi.c
gstsdidemux.c	Merge branch 'master' into 0.11	2011-08-04 09:36:07 +02:00
gstsdidemux.h
gstsdimux.c	sdi: Fix set-but-unused warnings	2011-07-12 18:08:45 -04:00
gstsdimux.h
Makefile.am	android: make it ready for androgenizer	2011-04-11 07:27:11 +02:00