aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/ppc
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-12-13 13:50:10 +0100
committerDiego Biurrun <diego@biurrun.de>2016-12-14 14:08:43 +0100
commit05a603a94e4b3eeefa5e18ae653a848001461e89 (patch)
treee4725eeb81460a3ddeec1d55b240b229030324b2 /libavutil/ppc
parentea7ee4b4e381e0fa731458de0cbf740430eeb013 (diff)
downloadffmpeg-05a603a94e4b3eeefa5e18ae653a848001461e89.tar.gz
ppc: Merge types_altivec.h into util_altivec.h
There is no point in keeping the two separate.
Diffstat (limited to 'libavutil/ppc')
-rw-r--r--libavutil/ppc/types_altivec.h47
-rw-r--r--libavutil/ppc/util_altivec.h23
2 files changed, 22 insertions, 48 deletions
diff --git a/libavutil/ppc/types_altivec.h b/libavutil/ppc/types_altivec.h
deleted file mode 100644
index 0a4eaf885f..0000000000
--- a/libavutil/ppc/types_altivec.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006 Guillaume Poirier <gpoirier@mplayerhq.hu>
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PPC_TYPES_ALTIVEC_H
-#define AVUTIL_PPC_TYPES_ALTIVEC_H
-
-/***********************************************************************
- * Vector types
- **********************************************************************/
-#define vec_u8 vector unsigned char
-#define vec_s8 vector signed char
-#define vec_u16 vector unsigned short
-#define vec_s16 vector signed short
-#define vec_u32 vector unsigned int
-#define vec_s32 vector signed int
-#define vec_f vector float
-
-/***********************************************************************
- * Null vector
- **********************************************************************/
-#define LOAD_ZERO const vec_u8 zerov = vec_splat_u8( 0 )
-
-#define zero_u8v (vec_u8) zerov
-#define zero_s8v (vec_s8) zerov
-#define zero_u16v (vec_u16) zerov
-#define zero_s16v (vec_s16) zerov
-#define zero_u32v (vec_u32) zerov
-#define zero_s32v (vec_s32) zerov
-
-#endif /* AVUTIL_PPC_TYPES_ALTIVEC_H */
diff --git a/libavutil/ppc/util_altivec.h b/libavutil/ppc/util_altivec.h
index 02cff186f9..5a16e8de13 100644
--- a/libavutil/ppc/util_altivec.h
+++ b/libavutil/ppc/util_altivec.h
@@ -32,7 +32,28 @@
#include <altivec.h>
#endif
-#include "types_altivec.h"
+/***********************************************************************
+ * Vector types
+ **********************************************************************/
+#define vec_u8 vector unsigned char
+#define vec_s8 vector signed char
+#define vec_u16 vector unsigned short
+#define vec_s16 vector signed short
+#define vec_u32 vector unsigned int
+#define vec_s32 vector signed int
+#define vec_f vector float
+
+/***********************************************************************
+ * Null vector
+ **********************************************************************/
+#define LOAD_ZERO const vec_u8 zerov = vec_splat_u8( 0 )
+
+#define zero_u8v (vec_u8) zerov
+#define zero_s8v (vec_s8) zerov
+#define zero_u16v (vec_u16) zerov
+#define zero_s16v (vec_s16) zerov
+#define zero_u32v (vec_u32) zerov
+#define zero_s32v (vec_s32) zerov
#if HAVE_ALTIVEC