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
..
2005-02-13 17:39:22 +00:00
2011-12-02 11:10:17 +00:00
2011-08-18 19:15:03 +02:00
2004-07-27 21:41:30 +00:00
2011-11-28 13:09:02 +00:00
2011-08-18 19:15:03 +02:00
2011-07-07 10:28:08 +02:00
2011-07-07 10:28:08 +02:00
2011-07-07 10:24:55 +02:00
2011-08-20 10:49:17 +02:00
2010-03-11 15:38:18 +01:00
2011-08-24 14:13:33 +02:00
2010-03-11 15:38:18 +01:00
2010-03-17 12:09:25 +01:00
2011-10-21 22:24:14 +02:00
2011-07-07 10:24:55 +02:00
2005-12-01 01:12:55 +00:00