Wim Taymans
7555d0949f
Merge branch 'master' into 0.11
Conflicts:
android/apetag.mk
android/avi.mk
android/flv.mk
android/icydemux.mk
android/id3demux.mk
android/qtdemux.mk
android/rtp.mk
android/rtpmanager.mk
android/rtsp.mk
android/soup.mk
android/udp.mk
android/wavenc.mk
android/wavparse.mk
configure.ac
2011-04-18 10:23:45 +02:00
..
2010-05-11 19:02:54 +01:00
2010-05-11 19:02:55 +01:00
2010-05-11 19:02:53 +01:00
2010-05-11 19:02:53 +01:00
2010-05-11 19:02:53 +01:00
2011-04-18 10:23:45 +02:00
2010-05-11 19:02:53 +01:00
2011-04-16 13:14:57 +01:00
2010-05-11 19:02:53 +01:00
2010-10-13 17:39:36 +03:00
2010-05-11 19:02:53 +01:00
2011-04-16 13:14:57 +01:00
2010-05-11 19:02:53 +01:00
2010-10-13 17:39:36 +03:00
2010-05-11 19:02:55 +01:00
2010-05-11 19:02:53 +01:00
2011-04-16 13:14:57 +01:00
2010-05-11 19:02:53 +01:00