Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:06:25 +0000 (16:06 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:06:25 +0000 (16:06 +0200)
commit33f18b8ea49f58367402abb9099abaa03b34f93c
tree393c12538093cee0cc185627ab582f0f5d71c748
parente204c5934c35e5af1be7afb70477f10a7b0cc2ac
parent7b592ff1265210cf3d74e2181664d269df7064e0
Merge branch 'master' into 0.11

Conflicts:
gst/audioparsers/gstamrparse.c
gst/isomp4/qtdemux.c
ext/soup/gstsouphttpsrc.c
gst/audioparsers/gstamrparse.c
gst/isomp4/qtdemux.c
gst/isomp4/qtdemux.h
gst/rtp/gstrtph263ppay.c
gst/rtpmanager/rtpsession.c
gst/rtsp/gstrtspsrc.c
gst/rtsp/gstrtspsrc.h
gst/udp/gstmultiudpsink.c
tests/check/elements/parser.c