Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 14:52:08 +0000 (16:52 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 28 Oct 2011 14:52:08 +0000 (16:52 +0200)
commitd40e915449edd1d1660df4a02d63ce92543f4da7
tree51ffd4b18f9851aa1e161ae73ec18d7be5c84e34
parent3389e79f38088904c11fe83952122d6d9d6240ef
parentff40deb139b49262c253f8ca284fdae82d256442
Merge branch 'master' into 0.11
ext/jpeg/gstjpegdec.c
gst/flv/gstflvdemux.c
gst/isomp4/qtdemux.c