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
..
app	Use the new GstSample for snapshots	2011-12-01 16:53:11 +01:00
audio	Merge branch 'master' into 0.11	2011-10-27 15:44:58 +02:00
dynamic	fix pad template names for request pads	2011-11-04 10:49:48 +01:00
encoding	Merge remote-tracking branch 'origin/master' into 0.11	2011-12-02 11:10:17 +00:00
gio	message: don't acces the structure directly	2011-05-10 13:35:49 +02:00
overlay	fix includes for moved interfaces	2011-11-30 07:23:47 +01:00
playrec	tests: fix unused-but-set-variable warnings with gcc 4.6	2011-04-14 00:24:26 +01:00
seek	Use the new GstSample for snapshots	2011-12-01 16:53:11 +01:00
snapshot	tests: update for query API changes	2011-07-27 01:18:19 +01:00
Makefile.am	Merge branch 'master' into 0.11	2011-10-27 15:44:58 +02:00