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
..
2011-12-02 12:03:27 +01:00
2011-12-02 11:10:17 +00:00
2011-12-02 11:10:17 +00:00
2011-12-02 12:03:27 +01:00
2011-12-02 12:03:27 +01:00
2011-11-11 13:14:21 +01:00
2011-11-02 23:35:15 +00:00
2011-12-02 12:03:27 +01:00
2010-12-15 11:54:32 +01:00
2011-04-06 16:11:02 +02:00
2008-05-21 11:52:30 +00:00