mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 10:10:32 +00:00
Code Issues 1 Projects Releases Wiki Activity
gstreamer/gst-libs
History
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
..
ext move ffmpeg stuff to gst-ffmpeg module 2004-02-13 15:11:50 +00:00
gst Merge remote-tracking branch 'origin/master' into 0.11 2011-12-02 11:10:17 +00:00
Makefile.am configure.ac: added GST_LIB_LDFLAGS and GST_ALL_LDFLAGS 2005-11-27 16:18:50 +00:00