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
..
2009-01-16 11:44:04 +00:00
2009-01-16 11:44:04 +00:00
2009-01-16 11:44:04 +00:00
2009-01-16 11:44:04 +00:00
2009-04-15 00:19:19 +01:00
2011-11-28 20:28:19 +01:00
2011-12-02 11:10:17 +00:00
2011-11-28 21:25:11 +00:00
2011-12-02 11:10:17 +00:00
2011-11-28 21:25:11 +00:00
2011-12-02 11:10:17 +00:00
2011-11-28 21:25:11 +00:00
2011-12-02 11:10:17 +00:00
2011-11-28 21:25:11 +00:00
2010-05-24 11:27:36 +02:00
2010-05-24 11:27:36 +02:00
2010-05-24 11:27:36 +02:00
2010-05-24 11:27:36 +02:00
2010-05-24 11:27:36 +02:00
2010-05-24 11:27:36 +02:00
2010-05-24 11:27:36 +02:00
2010-05-24 11:27:36 +02:00
2010-05-24 11:27:36 +02:00
2007-09-06 07:00:36 +00:00
2010-05-24 11:27:36 +02:00
2007-09-06 07:00:36 +00:00
2010-05-24 11:27:36 +02:00
2007-09-06 07:00:36 +00:00
2010-05-24 11:27:36 +02:00
2007-09-06 07:00:36 +00:00
2007-09-06 07:00:36 +00:00
2011-11-25 10:31:38 +01:00