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-09-06 11:53:35 +02:00
2011-06-10 23:56:34 -07:00
2011-12-02 11:10:17 +00:00
2011-11-02 09:04:27 +01:00
2011-04-16 15:59:45 +01:00
2011-04-16 15:59:45 +01:00
2010-09-09 10:57:41 +02:00
2011-10-13 08:53:34 +02:00
2011-11-11 19:57:25 +01:00
2011-06-21 17:36:21 +02:00
2004-07-27 21:41:30 +00:00