• Michael Niedermayer's avatar
    Merge commit 'b08569a2' · 30b8f3e7
    Michael Niedermayer authored
    * commit 'b08569a2':
      lavf: Replace the ASF demuxer
    
    Conflicts:
    	Changelog
    	libavformat/asf.h
    	libavformat/asfdec.c
    	libavformat/version.h
    	tests/ref/fate/wmv8-drm-nodec
    	tests/ref/seek/lavf-asf
    
    The rewritten demuxer is placed in a new file, the current demuxer is
    left as default. Carl has tested both and the one working better is
    default.
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    30b8f3e7
version.h 2.33 KB