Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 6 Oct 2011 10:23:39 +0000 (12:23 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 6 Oct 2011 10:23:39 +0000 (12:23 +0200)
commit586ef0babd9a644373079a10d30e5b7c5e526658
tree65b26219cb16d797a8f32414365d23612031409e
parent3d01b9f398d49d1ba012bdbdee350bd38aac526f
parentbe82dd8e3ab1599e2aad8c0301ff3841d9a36cb4
Merge branch 'master' into 0.11

Conflicts:
ext/speex/gstspeexdec.c
ext/speex/gstspeexenc.c
gst/isomp4/atoms.c
gst/isomp4/gstqtmux.c
ext/speex/gstspeexdec.c
ext/speex/gstspeexenc.c
gst/isomp4/atoms.c
gst/isomp4/atoms.h
gst/isomp4/gstqtmux.c
gst/isomp4/gstqtmux.h
gst/matroska/matroska-demux.c
sys/v4l2/gstv4l2object.c
sys/ximage/gstximagesrc.c