Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 17:38:01 +0000 (19:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 17:38:01 +0000 (19:38 +0200)
commitb55d3bbeed375f7b74442c4dd274d116a3e3d2e1
tree001d9e7b67c5596972c9802daaf2e4b78c5247e1
parentfa4e17c14035ebf43130fb369e1728cdd98d0b72
parent880e2aa23645ed9871c66ee1cbd00f93c72d2d73
Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73'

* commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73':
  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: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libavcodec/dct-test.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/vp3dsp.c
libavcodec/vp3dsp.h
libswscale/swscale.h
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/version.h
libswscale/yuv2rgb.c