Sebastian Dröge 93e3ed5a86 Merge branch 'master' into 0.11 ...

Conflicts:
	ext/cairo/gsttextoverlay.c
	ext/pulse/pulseaudiosink.c
	gst/audioparsers/gstaacparse.c
	gst/avi/gstavimux.c
	gst/flv/gstflvmux.c
	gst/interleave/interleave.c
	gst/isomp4/gstqtmux.c
	gst/matroska/matroska-demux.c
	gst/matroska/matroska-mux.c
	gst/matroska/matroska-mux.h
	gst/matroska/matroska-read-common.c
	gst/multifile/gstmultifilesink.c
	gst/multipart/multipartmux.c
	gst/shapewipe/gstshapewipe.c
	gst/smpte/gstsmpte.c
	gst/udp/gstmultiudpsink.c
	gst/videobox/gstvideobox.c
	gst/videocrop/gstaspectratiocrop.c
	gst/videomixer/videomixer.c
	gst/videomixer/videomixer2.c
	gst/wavparse/gstwavparse.c
	po/ja.po
	po/lv.po
	po/sr.po
	tests/check/Makefile.am
	tests/check/elements/qtmux.c
	tests/check/elements/rgvolume.c

2012-01-10 14:32:32 +01:00

..

gstximagesrc.c

Merge branch 'master' into 0.11

2012-01-10 14:32:32 +01:00

gstximagesrc.h

Merge branch 'master' into 0.11

2011-09-28 12:44:59 +02:00

Makefile.am

Don't install static libs for plugins. Fixes #550851 for -good.

2008-11-04 12:28:34 +00:00

ximageutil.c

ximage: port to 0.11

2011-07-10 14:56:00 +02:00

ximageutil.h

meta: fix for new API

2011-02-28 11:58:49 +01:00