gstreamer/sys/decklink
Wim Taymans 1119f6ee41 Merge branch 'master' into 0.11
Conflicts:
	ext/chromaprint/gstchromaprint.c
	ext/mpeg2enc/Makefile.am
	ext/voaacenc/gstvoaacenc.c
	gst/dvbsuboverlay/gstdvbsuboverlay.c
	gst/mpegtsdemux/mpegtsbase.c
	gst/sdp/gstsdpdemux.c
	gst/videoparsers/gsth264parse.c
	sys/d3dvideosink/d3dvideosink.c
	tests/examples/camerabin/gst-camera-perf.c
	tests/examples/camerabin/gst-camerabin-test.c
	tests/examples/camerabin2/gst-camerabin2-test.c
	tests/examples/mxf/mxfdemux-structure.c
	tests/examples/scaletempo/demo-main.c
2012-02-10 16:46:50 +01:00
..
linux decklink: add support for Windows 2011-08-21 19:06:05 -07:00
win Merge branch 'master' into 0.11 2011-08-25 12:49:26 +02:00
capture.cpp plenty: fixup glib deprecations 2012-01-27 15:47:07 +00:00
capture.h decklink: fix compilation on Linux 2011-08-21 19:06:54 -07:00
gstdecklink.cpp decklink: Add audio-input property 2011-08-03 13:39:33 -07:00
gstdecklink.h decklink: fix compilation on Linux 2011-08-21 19:06:54 -07:00
gstdecklinksink.cpp Merge branch 'master' into 0.11 2012-02-10 16:46:50 +01:00
gstdecklinksink.h decklink: fix compilation on Linux 2011-08-21 19:06:54 -07:00
gstdecklinksrc.cpp Merge branch 'master' into 0.11 2012-02-10 16:46:50 +01:00
gstdecklinksrc.h decklink: fix compilation on Linux 2011-08-21 19:06:54 -07:00
Makefile.am build: fix CFLAGS order and LIBS order 2012-02-03 00:50:33 +00:00