Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 16:01:14 +0000 (18:01 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 16:01:14 +0000 (18:01 +0200)
commit33467d96294c00e06cca77a0f789f203db0896bb
treeb5d539345763fa7a5b498fe98081b6a4a78eff82
parentd6740006d4ba269561d70d5ddf505632c26c827c
parent6d875c5ccd710a0ae0e646a3a8c9a8636aba5c95
Merge branch 'master' into 0.11

Conflicts:
configure.ac
ext/pango/gsttextoverlay.c
ext/theora/gsttheoradec.c
gst/adder/gstadder.c
gst/adder/gstadder.h
gst/audioresample/gstaudioresample.c
gst/encoding/gstencodebin.c
gst/playback/gstdecodebin.c
gst/playback/gstdecodebin2.c
tests/check/elements/decodebin2.c
tests/check/elements/playbin-compressed.c
win32/common/libgsttag.def
27 files changed:
configure.ac
docs/libs/gst-plugins-base-libs-docs.sgml
docs/libs/gst-plugins-base-libs-sections.txt
ext/ogg/gstoggstream.c
ext/pango/gsttextoverlay.c
ext/theora/gsttheoradec.c
gst-libs/gst/audio/gstbaseaudiosink.c
gst-libs/gst/tag/Makefile.am
gst-libs/gst/tag/gstexiftag.c
gst-libs/gst/tag/gstvorbistag.c
gst-libs/gst/tag/tag.h
gst-libs/gst/tag/tags.c
gst/adder/gstadder.c
gst/adder/gstadder.h
gst/audioresample/gstaudioresample.c
gst/audioresample/resample.c
gst/encoding/gstencodebin.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaybin2.c
gst/subparse/gstsubparse.c
gst/typefind/gsttypefindfunctions.c
gst/volume/gstvolume.c
tests/check/Makefile.am
tests/check/elements/audioresample.c
tests/check/elements/decodebin.c
tests/check/libs/tag.c
win32/common/libgsttag.def