• Michael Niedermayer's avatar
    Merge commit 'e74433a8' · 2b05db4f
    Michael Niedermayer authored
    * commit 'e74433a8':
      dsputil: Split clear_block*/fill_block* off into a separate context
    
    Conflicts:
    	configure
    	libavcodec/asvdec.c
    	libavcodec/dnxhddec.c
    	libavcodec/dnxhdenc.c
    	libavcodec/dsputil.h
    	libavcodec/eamad.c
    	libavcodec/intrax8.c
    	libavcodec/mjpegdec.c
    	libavcodec/ppc/dsputil_ppc.c
    	libavcodec/vc1dec.c
    	libavcodec/x86/dsputil_init.c
    	libavcodec/x86/dsputil_mmx.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2b05db4f
dsputil_x86.h 2.39 KB