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)
1  2 
ext/mpeg2dec/gstmpeg2dec.c
ext/mpeg2dec/gstmpeg2dec.h

Simple merge
Simple merge