Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 10:53:24 +0000 (11:53 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 10:53:24 +0000 (11:53 +0100)
commitc44cd8f55bc0bf409e86b039cad0e2f757d5c77e
treefee1a36e4d8d8b533b6e5f0c811e4449f9d5f351
parent3e8ae7603ccbef3db071f8798a1d3809f40f8639
parent440d7034f09de014f96ec183cd59e2b43bcf75c7
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
28 files changed:
configure.ac
docs/plugins/gst-plugins-good-plugins.args
docs/plugins/inspect/plugin-audioparsers.xml
docs/plugins/inspect/plugin-avi.xml
docs/plugins/inspect/plugin-gdkpixbuf.xml
docs/plugins/inspect/plugin-png.xml
docs/plugins/inspect/plugin-wavpack.xml
ext/flac/gstflacdec.c
ext/flac/gstflacdec.h
ext/flac/gstflacenc.c
ext/gdk_pixbuf/Makefile.am
ext/gdk_pixbuf/gstgdkpixbuf.c
ext/gdk_pixbuf/gstgdkpixbufoverlay.c
ext/libpng/gstpngdec.c
ext/libpng/gstpngenc.c
ext/libpng/gstpngenc.h
ext/speex/gstspeexdec.c
gst/audioparsers/gstflacparse.c
gst/deinterlace/gstdeinterlace.c
gst/flv/gstflvmux.c
gst/isomp4/gstqtmux.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/rtp/gstrtpdvdepay.c
gst/rtsp/gstrtspsrc.c
gst/rtsp/gstrtspsrc.h
gst/smpte/gstsmpte.c
sys/ximage/gstximagesrc.c