Wim Taymans
a2b7a672b8
Merge branch 'master' into 0.11
Conflicts:
android/aacparse.mk
android/amrparse.mk
android/h264parse.mk
android/metadata.mk
android/qtmux.mk
android/sdpelem.mk
configure.ac
gst/qtmux/gstqtmux.c
win32/common/config.h
2011-06-15 16:06:36 +02:00
..
2011-06-15 16:06:36 +02:00
2010-03-24 00:19:02 +00:00
2009-01-29 17:59:35 -02:00
2008-07-01 11:28:17 +00:00
2008-07-01 11:28:17 +00:00
2008-11-04 12:42:30 +00:00
2010-03-24 00:19:02 +00:00
2010-03-24 00:19:02 +00:00
2008-07-01 11:28:17 +00:00
2009-01-29 17:59:35 -02:00
2010-03-18 22:46:41 +01:00