Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 19 Apr 2011 17:23:56 +0000 (19:23 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 19 Apr 2011 17:23:56 +0000 (19:23 +0200)
commit98729bc82c24c9f11105f225b42c6fd0a6333983
treedceaef9d8253a0b46806bc62d14100808673455e
parent90ec31fbd9cc259fb697e75aaab617d2deb496f0
parent894760b682d934f8d236ce7e03595f5163f9b56e
Merge branch 'master' into 0.11

Conflicts:
android/amrnb.mk
android/amrwbdec.mk
android/asf.mk
android/mpegaudioparse.mk
configure.ac
configure.ac
gst/asfdemux/gstasfdemux.c