gstreamer/gst-libs/gst/app
Sebastian Dröge dc8984d76c Merge branch 'master' into 0.11
Conflicts:
	gst-libs/gst/app/gstappsrc.c
	gst-libs/gst/audio/multichannel.h
	gst-libs/gst/video/videooverlay.c
	gst/playback/gstplaysink.c
	gst/playback/gststreamsynchronizer.c
	tests/check/Makefile.am
	win32/common/libgstvideo.def
2012-01-10 13:15:12 +01:00
..
.gitignore gst-libs/gst/app/: Add marshal.list, make it compile and add to cvsignore. 2008-05-07 10:38:23 +00:00
gstapp-marshal.list update marshal list 2011-12-01 15:54:49 +01:00
gstappsink.c Merge remote-tracking branch 'origin/master' into 0.11 2011-12-08 01:19:03 +00:00
gstappsink.h Use the new GstSample for snapshots 2011-12-01 16:53:11 +01:00
gstappsrc.c Merge branch 'master' into 0.11 2012-01-10 13:15:12 +01:00
gstappsrc.h Merge branch 'master' into 0.11 2012-01-10 13:15:12 +01:00
Makefile.am gst-libs: Add --warn-all to introspection scanner 2011-11-25 10:31:38 +01:00