• Michael Niedermayer's avatar
    Merge commit 'e3fcb143' · 581b5f0b
    Michael Niedermayer authored
    * commit 'e3fcb143':
      dsputil: Split off IDCT bits into their own context
    
    Conflicts:
    	configure
    	libavcodec/aic.c
    	libavcodec/arm/Makefile
    	libavcodec/arm/dsputil_init_arm.c
    	libavcodec/arm/dsputil_init_armv6.c
    	libavcodec/asvdec.c
    	libavcodec/dnxhdenc.c
    	libavcodec/dsputil.c
    	libavcodec/dvdec.c
    	libavcodec/dxva2_mpeg2.c
    	libavcodec/intrax8.c
    	libavcodec/mdec.c
    	libavcodec/mjpegdec.c
    	libavcodec/mjpegenc_common.h
    	libavcodec/mpegvideo.c
    	libavcodec/ppc/dsputil_altivec.h
    	libavcodec/ppc/dsputil_ppc.c
    	libavcodec/ppc/idctdsp.c
    	libavcodec/x86/Makefile
    	libavcodec/x86/dsputil_init.c
    	libavcodec/x86/dsputil_mmx.c
    	libavcodec/x86/dsputil_x86.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    581b5f0b
Makefile 7.36 KB