Tim-Philipp Müller 177525f89f Merge remote-tracking branch 'origin/master' into 0.11 ... Conflicts: gst-libs/gst/netbuffer/gstnetbuffer.c gst/ffmpegcolorspace/avcodec.h gst/ffmpegcolorspace/gstffmpegcodecmap.c gst/ffmpegcolorspace/imgconvert.c gst/ffmpegcolorspace/imgconvert_template.h gst/ffmpegcolorspace/mem.c gst/playback/README gst/playback/gstplaybasebin.c gst/playback/gstplaybasebin.h gst/playback/gstplaybin.c sys/v4l/v4lmjpegsrc_calls.c sys/v4l/videodev_mjpeg.h tests/check/elements/gnomevfssink.c		2011-12-02 11:10:17 +00:00
..
Makefile.am	visual: port some more to new audio caps	2011-08-19 16:49:30 +02:00
visual.c	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-02 11:10:17 +00:00