Wim Taymans c44cd8f55b Merge branch 'master' into 0.11 ...

unport gdkpixbuf
not merged: https://bugzilla.gnome.org/show_bug.cgi?id=654850

Conflicts:
	docs/plugins/Makefile.am
	docs/plugins/gst-plugins-good-plugins-docs.sgml
	docs/plugins/gst-plugins-good-plugins-sections.txt
	docs/plugins/gst-plugins-good-plugins.hierarchy
	docs/plugins/inspect/plugin-avi.xml
	docs/plugins/inspect/plugin-png.xml
	ext/flac/gstflacdec.c
	ext/flac/gstflacdec.h
	ext/libpng/gstpngdec.c
	ext/libpng/gstpngenc.c
	ext/speex/gstspeexdec.c
	gst/audioparsers/gstflacparse.c
	gst/flv/gstflvmux.c
	gst/rtp/gstrtpdvdepay.c
	gst/rtp/gstrtph264depay.c

2012-03-22 11:53:24 +01:00

..

gstximagesrc.c

Merge branch 'master' into 0.11

2012-03-22 11:53:24 +01:00

gstximagesrc.h

port to new gthread API

2012-01-19 11:33:53 +01:00

Makefile.am

ximage: use new style caps

2012-03-05 12:03:01 +01:00

ximageutil.c

update for metadata API changes

2012-02-29 17:26:01 +01:00

ximageutil.h

update for metadata API changes

2012-02-29 17:26:01 +01:00