Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 25 Aug 2011 10:49:26 +0000 (12:49 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 25 Aug 2011 10:49:26 +0000 (12:49 +0200)
commitad06ac2b4b2d88dc0bf12e3ce605918c4ace5fb7
treeb4447b8fb939e4a12f94a4204cf84783dd3b0b0a
parent52d48bb142d2f56c90c32d13f0199d1163326602
parentdc3db053b5f50c6141274d7a51e244daf0442abd
Merge branch 'master' into 0.11

Conflicts:
ext/resindvd/rsnwrappedbuffer.c
configure.ac
ext/resindvd/rsnwrappedbuffer.c
sys/decklink/win/DeckLinkAPI_i.c