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
..
.gitignore	inter: add ignore file for intermediate files	2011-07-08 00:11:37 -07:00
gstinter.c	inter: Add channel property	2012-01-22 15:52:15 -08:00
gstinteraudiosink.c	Merge branch 'master' into 0.11	2012-01-25 13:22:43 +01:00
gstinteraudiosink.h	inter: remove (leaking) dead code	2012-01-12 16:48:38 +00:00
gstinteraudiosrc.c	Merge branch 'master' into 0.11	2012-01-25 13:22:43 +01:00
gstinteraudiosrc.h	inter: remove (leaking) dead code	2012-01-12 16:48:38 +00:00
gstintersubsink.c	inter: Fix compilation	2012-01-22 16:55:46 -08:00
gstintersubsink.h	inter: Add subtitle inter elements	2012-01-22 15:49:44 -08:00
gstintersubsrc.c	inter: Add subtitle inter elements	2012-01-22 15:49:44 -08:00
gstintersubsrc.h	inter: Add subtitle inter elements	2012-01-22 15:49:44 -08:00
gstintersurface.c	plenty: fixup glib deprecations	2012-01-27 15:47:07 +00:00
gstintersurface.h	inter: Add channel property	2012-01-22 15:52:15 -08:00
gstintertest.c	plenty: fixup glib deprecations	2012-01-27 15:47:07 +00:00
gstintervideosink.c	Merge branch 'master' into 0.11	2012-01-25 13:22:43 +01:00
gstintervideosink.h	inter: Add channel property	2012-01-22 15:52:15 -08:00
gstintervideosrc.c	Merge branch 'master' into 0.11	2012-01-25 13:22:43 +01:00
gstintervideosrc.h	inter: Add channel property	2012-01-22 15:52:15 -08:00
Makefile.am	build: fix CFLAGS order and LIBS order	2012-02-03 00:50:33 +00:00