Merge remote-tracking branch 'origin/master' into 0.11-premerge
authorEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 10:41:17 +0000 (11:41 +0100)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Fri, 30 Dec 2011 10:41:17 +0000 (11:41 +0100)
commitf70a623418a52eada0278002f8d266d49957b3d5
treefc54fd9fab400e886b11a9a2b313478b66dd7969
parentd5aaefa59f9ef4153644a2aa254c39a3a9d108e3
parentd465188879cd4dd0735e3fbcaeb83d98f217ed88
Merge remote-tracking branch 'origin/master' into 0.11-premerge

Conflicts:
docs/libs/Makefile.am
ext/kate/gstkatetiger.c
ext/opus/gstopusdec.c
ext/xvid/gstxvidenc.c
gst-libs/gst/basecamerabinsrc/Makefile.am
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideoencoder.c
gst/asfmux/gstasfmux.c
gst/audiovisualizers/gstwavescope.c
gst/camerabin2/gstcamerabin2.c
gst/debugutils/gstcompare.c
gst/frei0r/gstfrei0rmixer.c
gst/mpegpsmux/mpegpsmux.c
gst/mpegtsmux/mpegtsmux.c
gst/mxf/mxfmux.c
gst/videomeasure/gstvideomeasure_ssim.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gstmpeg4videoparse.c
44 files changed:
configure.ac
docs/libs/Makefile.am
docs/libs/gst-plugins-bad-libs-sections.txt
ext/dts/gstdtsdec.c
ext/faac/gstfaac.c
ext/kate/gstkatetiger.c
ext/opencv/gstmotioncells.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
ext/opus/gstopusheader.c
ext/opus/gstopusparse.c
ext/opus/gstrtpopusdepay.c
ext/opus/gstrtpopusdepay.h
ext/opus/gstrtpopuspay.c
ext/opus/gstrtpopuspay.h
ext/resindvd/rsndec.c
ext/voamrwbenc/gstvoamrwbenc.c
ext/xvid/gstxvidenc.c
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideoencoder.c
gst-libs/gst/video/gstbasevideoencoder.h
gst/asfmux/gstasfmux.c
gst/audiovisualizers/gstspacescope.c
gst/audiovisualizers/gstwavescope.c
gst/autoconvert/gstautoconvert.c
gst/camerabin2/camerabingeneral.c
gst/camerabin2/gstcamerabin2.c
gst/camerabin2/gstviewfinderbin.c
gst/camerabin2/gstwrappercamerabinsrc.c
gst/debugutils/gstcompare.c
gst/frei0r/gstfrei0rmixer.c
gst/liveadder/liveadder.c
gst/mpegdemux/mpegtsparse.c
gst/mpegpsmux/mpegpsmux.c
gst/mpegtsmux/mpegtsmux.c
gst/mxf/mxfmux.c
gst/videomeasure/gstvideomeasure_ssim.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gstmpeg4videoparse.c
tests/check/Makefile.am
tests/check/elements/camerabin2.c
tests/check/pipelines/colorspace.c