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>

2 files changed, 0 insertions, 88 deletions

diff --git a/libavutil/bfin/asm.h b/libavutil/bfin/asm.h
deleted file mode 100644
index 703e65d9a8..0000000000
--- a/libavutil/bfin/asm.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BFIN_ASM_H
-#define AVUTIL_BFIN_ASM_H
-
-#include "config.h"
-
-#define mL3 .text
-
-#if defined(__FDPIC__) && CONFIG_SRAM
-#define mL1 .l1.text
-#define SECTION_L1_DATA_A .section .l1.data.A,"aw",@progbits
-#define SECTION_L1_DATA_B .section .l1.data.B,"aw",@progbits
-#else
-#define mL1 mL3
-#define SECTION_L1_DATA_A
-#define SECTION_L1_DATA_B .data
-#endif
-
-#define DEFUN(fname, where, interface)          \
-    .section where;                             \
-    .global _ff_bfin_ ## fname;                 \
-    .type _ff_bfin_ ## fname, STT_FUNC;         \
-    .align 8;                                   \
-    _ff_bfin_ ## fname
-
-#define DEFUN_END(fname) \
-    .size _ff_bfin_ ## fname, . - _ff_bfin_ ## fname
-
-#ifdef __FDPIC__
-#define RELOC(reg, got, obj) reg = [got + obj@GOT17M4]
-#else
-#define RELOC(reg, got, obj) reg.L = obj; reg.H = obj
-#endif
-
-#endif /* AVUTIL_BFIN_ASM_H */
diff --git a/libavutil/bfin/attributes.h b/libavutil/bfin/attributes.h
deleted file mode 100644
index f55699e523..0000000000
--- a/libavutil/bfin/attributes.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2007 Marc Hoffman <mmh@pleasantst.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_BFIN_ATTRIBUTES_H
-#define AVUTIL_BFIN_ATTRIBUTES_H
-
-#include "config.h"
-
-#if defined(__FDPIC__) && CONFIG_SRAM
-#define attribute_l1_text   __attribute__((l1_text))
-#define attribute_l1_data_b __attribute__((l1_data_B))
-#else
-#define attribute_l1_text
-#define attribute_l1_data_b
-#endif
-
-#endif /* AVUTIL_BFIN_ATTRIBUTES_H */