Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:37:03 +0000 (16:37 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 14:37:03 +0000 (16:37 +0200)
commit83ea243000303ab6fd63e78139050e8f015feddc
tree4113bf598b5e97cf24fef812ce6d2766d1b64b83
parent33f18b8ea49f58367402abb9099abaa03b34f93c
parent8191c6af1ccf46486d24c0a134303b918e947f89
Merge branch 'master' into 0.11

Conflicts:
common
common
gst/rtp/gstrtpmp4gdepay.c