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
..
2010-04-16 19:45:16 +02:00
2010-04-16 19:41:46 +02:00
2009-05-27 22:57:03 +01:00
2010-05-19 18:24:02 -07:00
2008-10-28 20:06:27 +00:00
2008-10-28 20:06:27 +00:00
2011-04-15 00:24:47 +01:00
2009-10-01 15:09:27 +02:00
2010-12-12 02:21:53 +11:00
2010-12-12 02:21:53 +11:00
2010-03-18 22:46:41 +01:00
2009-10-27 12:23:24 +00:00
2009-10-01 14:37:43 +02:00
2011-06-15 16:06:36 +02:00
2010-03-18 22:46:41 +01:00
2009-10-27 12:23:26 +00:00
2011-03-08 17:03:22 +00:00
2011-02-28 12:06:57 +01:00