diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-02 19:38:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-02 19:38:01 +0200 |
| commit | b55d3bbeed375f7b74442c4dd274d116a3e3d2e1 (patch) | |
| tree | 001d9e7b67c5596972c9802daaf2e4b78c5247e1 /libswscale/version.h | |
| parent | fa4e17c14035ebf43130fb369e1728cdd98d0b72 (diff) | |
| parent | 880e2aa23645ed9871c66ee1cbd00f93c72d2d73 (diff) | |
| download | ffmpeg-b55d3bbeed375f7b74442c4dd274d116a3e3d2e1.tar.gz | |
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>
Diffstat (limited to 'libswscale/version.h')
| -rw-r--r-- | libswscale/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libswscale/version.h b/libswscale/version.h index b0338636f5..c0d4f8ab0f 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -55,5 +55,8 @@ #ifndef FF_API_SWS_FORMAT_NAME #define FF_API_SWS_FORMAT_NAME (LIBSWSCALE_VERSION_MAJOR < 3) #endif +#ifndef FF_API_ARCH_BFIN +#define FF_API_ARCH_BFIN (LIBSWSCALE_VERSION_MAJOR < 3) +#endif #endif /* SWSCALE_VERSION_H */ |