Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 15:34:19 +0000 (17:34 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 15:34:19 +0000 (17:34 +0200)
commitd89790d5451c523bb23bcb144af3371fd6217ec8
tree5c8ba0a2e623088877b13657fbdeea442602f88f
parente15651816e8420ee7e4584a161699be4cd81cdef
parent397dc60b711fcb9a818226d894938493158a463d
Merge branch 'master' into 0.11

Conflicts:
gst/avi/gstavidemux.c
gst/rtp/gstrtpac3depay.c
gst/rtp/gstrtpg726depay.c
gst/rtp/gstrtpmpvdepay.c
gst/videofilter/gstgamma.c
17 files changed:
configure.ac
ext/flac/gstflacdec.c
gst/avi/gstavidemux.c
gst/isomp4/qtdemux.c
gst/matroska/matroska-demux.c
gst/rtp/gstrtpac3depay.c
gst/rtp/gstrtpbvdepay.c
gst/rtp/gstrtpg722depay.c
gst/rtp/gstrtpg726depay.c
gst/rtp/gstrtpgsmdepay.c
gst/rtp/gstrtpilbcdepay.c
gst/rtp/gstrtpmpvdepay.c
gst/rtp/gstrtppcmadepay.c
gst/rtp/gstrtppcmudepay.c
gst/rtsp/gstrtspsrc.c
sys/v4l2/gstv4l2object.c
sys/v4l2/gstv4l2sink.c