Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 30 Sep 2011 15:45:31 +0000 (17:45 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 30 Sep 2011 15:45:31 +0000 (17:45 +0200)
commitd255e3db39c03defe36fc489d8fc3a11d946c14a
treea9422d8fa62803276c2b9559e66b7f8a3255854e
parent62d5386b066d2eeeb1323bba93d2717b8f1ae518
parent2cb398d20dd85b206b1ef5f67de704f090fe5b5b
Merge branch 'master' into 0.11
ext/mpeg2dec/gstmpeg2dec.c
ext/mpeg2dec/gstmpeg2dec.h