Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 24 Apr 2012 16:14:31 +0000 (18:14 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 24 Apr 2012 16:14:31 +0000 (18:14 +0200)
commita0e3a9e32dc9112dd6a62230b8212c84834c473f
tree75b0901de16c086ad25a7376eb6d8ce6607a889d
parent56602aa8fcca85d0c02a0fd4f503f9dcb8cd863d
parent8c3be067c7adc214d8b8a1955354dd6b74afbb6b
Merge remote-tracking branch 'origin/0.10'

Video base classes and theora plugin still needs to be ported again

Conflicts:
docs/libs/gst-plugins-base-libs-docs.sgml
docs/libs/gst-plugins-base-libs-sections.txt
docs/libs/gst-plugins-base-libs.types
ext/theora/gsttheoradec.c
ext/theora/gsttheoradec.h
ext/theora/gsttheoraenc.c
ext/theora/gsttheoraenc.h
gst-libs/gst/video/Makefile.am
gst-libs/gst/video/video.c
gst-libs/gst/video/video.h
gst/playback/gsturidecodebin.c
tests/check/libs/video.c
tests/check/pipelines/theoraenc.c
win32/common/libgstvideo.def
docs/libs/gst-plugins-base-libs-docs.sgml
docs/libs/gst-plugins-base-libs-sections.txt
gst-libs/gst/video/Makefile.am
tests/check/pipelines/theoraenc.c