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
..
2010-01-14 10:10:23 +01:00
2011-12-02 11:10:17 +00:00
2011-12-02 11:10:17 +00:00
2011-11-28 13:09:02 +00:00
2011-06-17 15:41:31 +02:00
2011-12-02 11:10:17 +00:00
2009-10-23 17:49:48 -07:00
2010-07-16 17:40:12 +02:00