• Michael Niedermayer's avatar
    Merge commit '880e2aa2' · b55d3bbe
    Michael Niedermayer authored
    * commit '880e2aa2':
      Remove all Blackfin architecture optimizations
    
    Conflicts:
    	libavcodec/bfin/dsputil.S
    	libavcodec/bfin/dsputil_init.c
    	libavcodec/bfin/fdct_bfin.S
    	libavcodec/bfin/hpel_pixels_no_rnd.S
    	libavcodec/bfin/hpeldsp_init.c
    	libavcodec/bfin/idct_bfin.S
    	libavcodec/bfin/mathops.h
    	libavcodec/bfin/pixels.S
    	libavcodec/bfin/pixels.h
    	libavcodec/bfin/vp3dsp.S
    	libavcodec/bfin/vp3dsp_init.c
    	libavutil/bfin/asm.h
    	libavutil/bfin/attributes.h
    	libswscale/bfin/internal_bfin.S
    	libswscale/bfin/swscale_bfin.c
    	libswscale/bfin/yuv2rgb_bfin.c
    	libswscale/swscale_internal.h
    	libswscale/version.h
    
    If someone wants to maintain blackfin support in FFmpeg, please contact
    ffmpeg-devel@ffmpeg.org
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b55d3bbe
swscale_internal.h 38.6 KB