Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 13:24:32 +0000 (15:24 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 13:24:32 +0000 (15:24 +0200)
commit7012e88090e69339c60a4eb9449f7a7e39ca6aa3
tree9487bbfc440f54cca64281bd46bf35628d94c9d8
parent33196cdd2cec82d8fc0546a957bb069208453505
parent9a8a989a2270d8b7bd964cf0c2ee668fa6dc2fbc
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstbaseaudioencoder.h
gst/playback/Makefile.am
gst/playback/gstplaybin.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkvideoconvert.c
gst/playback/gstsubtitleoverlay.c
gst/videorate/gstvideorate.c
gst/videoscale/gstvideoscale.c
win32/common/libgstaudio.def
45 files changed:
docs/libs/Makefile.am
docs/libs/gst-plugins-base-libs-docs.sgml
docs/libs/gst-plugins-base-libs-sections.txt
docs/libs/gst-plugins-base-libs.types
gst-libs/gst/audio/Makefile.am
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstaudioencoder.h
gst-libs/gst/audio/gstaudiofilterexample.c
gst-libs/gst/audio/gstaudioprocess.c
gst-libs/gst/audio/gstaudioprocess.h
gst-libs/gst/audio/gstaudioringbuffer.c
gst-libs/gst/audio/gstaudioringbuffer.h
gst-libs/gst/audio/gstbaseaudiosrc.c.orig
gst-libs/gst/audio/gstbaseaudiosrc.c.rej
gst-libs/gst/audio/gstringbufferthread.c
gst-libs/gst/audio/gstringbufferthread.h
gst-libs/gst/cdda/gst-plugins-base-sha1-2.patch
gst-libs/gst/cdda/gstcddabasesrc.c.orig
gst-libs/gst/rtp/gst-plugins-base-rtcp-feedback.patch
gst-libs/gst/rtp/gstbasertppayload.c.orig
gst-libs/gst/rtp/gstbasertppayload.c.rej
gst-libs/gst/rtp/gstrtpbuffer.c.new
gst-libs/gst/rtsp/gstrtspconnection.c.orig
gst-libs/gst/rtsp/rtsp-marshal.c
gst-libs/gst/rtsp/rtsp-marshal.h
gst-libs/gst/rtsp/rtspdefs.patch
gst-libs/gst/video/gstmetavideoclip.h
gst/encoding/gstencodebin.c
gst/playback/Makefile.am
gst/playback/gstdecodebin2.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkvideoconvert.c
gst/playback/gstsubtitleoverlay.c
gst/videorate/gstvideorate.c
gst/videorate/videorate-discont.patch
gst/videoscale/gstvideoscale.c
gst/videoscale/gstvideoscale.h
tests/check/libs/profile.c
tests/check/libs/tag.c
tests/check/libs/video.c
tests/examples/seek/seek.c
win32/common/libgstaudio.def