Merge branch 'master' into 0.11
authorEdward Hervey <bilboed@bilboed.com>
Fri, 23 Sep 2011 16:27:11 +0000 (18:27 +0200)
committerEdward Hervey <bilboed@bilboed.com>
Fri, 23 Sep 2011 16:27:11 +0000 (18:27 +0200)
commit17bfba09f118efa4336be90233a142a7923016c9
tree688656232996408d024375e3a0f27225bc0836a2
parent3f45eb1cfcb7937bbb621b23fa4f2b303c3fcd54
parent001b4a0072fae1f695698660e2d7642c37ea665b
Merge branch 'master' into 0.11

Conflicts:
ext/ogg/gstoggdemux.c
ext/pango/gsttextoverlay.c
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstbaseaudiosrc.c
gst/playback/gstsubtitleoverlay.c
gst/videorate/gstvideorate.c
21 files changed:
docs/design/design-decodebin.txt
ext/ogg/gstoggdemux.c
ext/ogg/gstoggdemux.h
ext/ogg/gstoggstream.c
ext/pango/gstbasetextoverlay.c
ext/theora/gsttheoraenc.c
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/interfaces/colorbalance.c
gst-libs/gst/pbutils/gstdiscoverer.h
gst-libs/gst/tag/tag.h
gst/adder/gstadder.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaybin2.c
gst/playback/gstplaysink.c
gst/playback/gstsubtitleoverlay.c
gst/subparse/gstsubparse.c
gst/typefind/gsttypefindfunctions.c
gst/videorate/gstvideorate.c
tests/check/elements/videorate.c