Skip to content
  • Wim Taymans's avatar
    Merge branch 'master' into 0.11 · 7555d094
    Wim Taymans authored
    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
    7555d094