1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libswscale
Michael Niedermayer b55d3bbeed 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>
2014-06-02 19:38:01 +02:00
..
arm swscale: disable ARM code until its build failure with clang/iphone is fixed 2014-01-12 19:58:38 +01:00
ppc ppc: don't return a value from a function declared void 2013-08-30 11:56:11 +02:00
x86 inline asm: fix arrays as named constraints. 2014-05-07 15:02:45 +02:00
bayer_template.c libswscale: bayer to rgb24 & yv12 colorspace converters 2014-02-23 02:38:22 +01:00
colorspace-test.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
input.c swscale/input: replace assert() by av_assert1() 2014-04-09 05:14:34 +02:00
libswscale.v swscale: Do not make ff_ symbols globally visible. 2012-10-10 02:08:01 +02:00
Makefile Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
options.c swscale: add two spatially stable dithering methods 2014-03-25 13:48:06 +01:00
output.c Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3' 2014-04-09 03:36:38 +02:00
rgb2rgb_template.c Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9' 2014-01-21 21:55:20 +01:00
rgb2rgb.c Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9' 2014-01-21 21:55:20 +01:00
rgb2rgb.h swscale: add nv12/nv21->yuv420 converter 2014-01-21 17:55:07 +01:00
swscale_internal.h Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00
swscale_unscaled.c Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00
swscale-test.c Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
swscale.c swscale/swscale: fix srcStride/srcSlice typo 2014-04-16 02:09:39 +02:00
swscale.h Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00
swscaleres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
utils.c sws: document color range >8bit oddity 2014-05-21 21:29:33 +02:00
version.h Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00
yuv2rgb.c Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73' 2014-06-02 19:38:01 +02:00