• Michael Niedermayer's avatar
    Merge commit 'ac4b32df' · fb61ed1e
    Michael Niedermayer authored
    * commit 'ac4b32df':
      On2 VP7 decoder
    
    Conflicts:
    	Changelog
    	libavcodec/arm/h264pred_init_arm.c
    	libavcodec/arm/vp8dsp.h
    	libavcodec/arm/vp8dsp_init_arm.c
    	libavcodec/arm/vp8dsp_init_armv6.c
    	libavcodec/arm/vp8dsp_init_neon.c
    	libavcodec/avcodec.h
    	libavcodec/h264pred.c
    	libavcodec/version.h
    	libavcodec/vp8.c
    	libavcodec/vp8.h
    	libavcodec/vp8data.h
    	libavcodec/vp8dsp.c
    	libavcodec/vp8dsp.h
    	libavcodec/x86/h264_intrapred_init.c
    	libavcodec/x86/vp8dsp_init.c
    
    See: 89f2f5db and others
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    fb61ed1e
version.h 4.99 KB