Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:18:01 +0000 (12:18 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:18:01 +0000 (12:18 +0100)
commit95f39873327d789b7b4d929cf9a498f2eb1143ce
tree18c25703010889ea1df4b5e3f1d5acd84beb689a
parent49658dd5b577dd06bd292339eeb7d0c739464716
parent9c3516116a50750371afa4c26c6a32f5d22d246a
Merge branch 'master' into 0.11

Conflicts:
ext/flac/gstflacdec.c
gst/audioparsers/gstflacparse.c
gst/isomp4/qtdemux.c
gst/audioparsers/gstflacparse.c
gst/flv/gstflvdemux.c
gst/flv/gstflvdemux.h
gst/isomp4/qtdemux.c
gst/rtp/gstrtph263ppay.c