Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 27 Feb 2012 01:00:03 +0000 (01:00 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 27 Feb 2012 01:00:03 +0000 (01:00 +0000)
commitf49410d69882975c51cd51ae7702715f06bd2204
tree649419aeb6fc018cf3dcf8bdd9b03bf877d2de60
parentcf1e3cd2a2167f1eb15b900387020de0688c0404
parent6e96f4c201d2d11a84d16dd52bb083bf8683da24
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
gst/audioparsers/gstmpegaudioparse.c
gst/audioparsers/gstmpegaudioparse.c
gst/flv/gstflvmux.c
gst/isomp4/gstqtmux.c
gst/matroska/matroska-mux.c