Commit graph

7 commits

Author SHA1 Message Date
Sebastian Dröge
49f85b38b7 Merge remote-tracking branch 'origin/0.10'
Conflicts:
	configure.ac
2012-03-29 15:03:09 +02:00
Tim-Philipp Müller
e780771223 gdkpixbufoverlay: add "alpha" property to set alpha of overlay image
.. or turn the overlay off by setting alpha to 0.0
2012-03-25 00:18:43 +00:00
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
Tim-Philipp Müller
e300675384 docs: update docs for new properties and add gdkpixbufoverlay element
Somewhat at least. No idea why it doesn't pick up the description
or example pipeline.
2012-03-18 00:17:21 +00:00
Tim-Philipp Müller
a4860b3c01 gdkpixbufoverlay: make most properties controllable and flag them as mutable-playing 2012-03-18 00:12:19 +00:00
Tim-Philipp Müller
fdb7ec12b4 gdkpixbufoverlay: add properties for positioning and sizing 2012-03-17 23:46:23 +00:00
Tim-Philipp Müller
729a30c38b gdkpixbuf: add gdkpixbufoverlay element
Still lacks features such as positioning or resizing, or
animations, but it's usable already, and supports lots of
formats.
2012-03-17 20:19:29 +00:00