Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 6 Apr 2011 14:33:56 +0000 (16:33 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 6 Apr 2011 14:33:56 +0000 (16:33 +0200)
commit4007076b55f6809f0b834d1041167e157ba822be
treee3fbbdf38ad09c62d4f6d95e43c71ce685cd573b
parent518ededd1607c2f0965519d2e45ce9e3df37db17
parent9cf76f114f4088d700be3e26c0fafe09e1bce3a0
Merge branch 'master' into 0.11

Conflicts:
ext/theora/gsttheoraenc.c
ext/theora/gsttheoraenc.c
gst-libs/gst/rtp/gstrtcpbuffer.c
gst-libs/gst/tag/gstexiftag.c
gst-libs/gst/tag/gstvorbistag.c
gst-libs/gst/tag/gstxmptag.c
gst/audioresample/gstaudioresample.c
sys/xvimage/xvimagesink.c
tests/check/libs/video.c