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-12-30 14:20:52 -08:00
2011-04-16 13:23:50 +01:00
2010-10-12 11:37:40 +02:00
2011-01-02 15:26:30 +00:00
2011-04-16 17:57:32 +01:00
2011-02-28 11:58:48 +01:00
2011-04-16 18:07:35 +01:00
2010-09-21 23:35:38 +03:00
2010-10-12 11:37:40 +02:00
2011-02-28 11:58:48 +01:00
2011-03-07 10:47:23 +01:00