gstreamer/gst-libs/gst
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
..
app Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
audio Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
fft Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
interfaces Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
pbutils Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
riff Merge remote-tracking branch 'origin/master' into 0.11 2011-11-26 12:12:59 +00:00
rtp Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
rtsp Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
sdp gst-libs: Add --warn-all to introspection scanner 2011-11-25 10:31:38 +01:00
tag Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
video Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
gettext.h Fix for ENABLE_NLS being undefined for -Wundef 2010-03-16 18:06:16 +01:00
gst-i18n-plugin.h *.h: Revert indenting 2004-03-15 16:32:55 +00:00
Makefile.am cdda: rename GstCddaBaseSrc to GstAudioCdSrc and move to libgstaudio 2011-11-12 11:58:58 +00:00