Wim Taymans a2b7a672b8 Merge branch 'master' into 0.11 ... Conflicts: android/aacparse.mk android/amrparse.mk android/h264parse.mk android/metadata.mk android/qtmux.mk android/sdpelem.mk configure.ac gst/qtmux/gstqtmux.c win32/common/config.h		2011-06-15 16:06:36 +02:00
..
.gitignore	ex/: #define red green	2006-06-12 11:30:08 +00:00
dfb-example.c	directfb: don't put code with side-effects into g_assert()	2011-01-08 00:01:01 +00:00
dfbvideosink.c	Merge branch 'master' into 0.11	2011-06-15 16:06:36 +02:00
dfbvideosink.h	meta: fix for new metadata api	2011-02-28 12:06:57 +01:00
Makefile.am	Remove setting of plugindir from Makefiles	2011-04-01 13:54:02 -07:00