Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 12:21:35 +0000 (13:21 +0100)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 12:21:35 +0000 (13:21 +0100)
commitf562a29284a1ddcaf3e04b0e77f5629aaf71b9bd
tree8cebe201b2b13bd811291b9603e030a55b9d9970
parent7ed96ea16a6001e493ad26b40145447f881c3720
parent08022bddc84c8a75b5af0f287ce2416edf31f417
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/theora/gsttheoraenc.c
gst-libs/gst/tag/gstexiftag.c
gst/adder/gstadder.c
gst/adder/gstadder.h
gst/playback/gstdecodebin2.c
gst/playback/gstsubtitleoverlay.c
tests/check/libs/tag.c
18 files changed:
ext/ogg/gstoggdemux.c
ext/ogg/gstoggmux.c
ext/theora/gsttheoraenc.c
ext/theora/gsttheoraenc.h
gst-libs/gst/audio/gstaudiobasesink.c
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/tag/gstexiftag.c
gst-libs/gst/tag/gstxmptag.c
gst/adder/gstadder.c
gst/adder/gstadder.h
gst/playback/gstdecodebin2.c
gst/playback/gstsubtitleoverlay.c
tests/check/elements/audioconvert.c
tests/check/elements/decodebin.c
tests/check/libs/tag.c
tests/check/libs/video.c