From ae116cd3ed908d28b69d5198712217ec743d74f6 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 29 Jan 2014 16:06:28 -0800 Subject: ppc: dsputil: Move hpeldsp-related declarations to a separate header --- libavcodec/ppc/dsputil_altivec.h | 5 ----- libavcodec/ppc/h264qpel.c | 2 +- libavcodec/ppc/hpeldsp_altivec.c | 2 +- libavcodec/ppc/hpeldsp_altivec.h | 34 ++++++++++++++++++++++++++++++++++ libavcodec/ppc/vp8dsp_altivec.c | 2 +- 5 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 libavcodec/ppc/hpeldsp_altivec.h (limited to 'libavcodec/ppc') diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h index 929cb7506b..7833b4b0e3 100644 --- a/libavcodec/ppc/dsputil_altivec.h +++ b/libavcodec/ppc/dsputil_altivec.h @@ -27,11 +27,6 @@ #include "libavcodec/dsputil.h" -void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); - void ff_fdct_altivec(int16_t *block); void ff_gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h, int x16, int y16, int rounder); diff --git a/libavcodec/ppc/h264qpel.c b/libavcodec/ppc/h264qpel.c index f99c8f8126..aae6725973 100644 --- a/libavcodec/ppc/h264qpel.c +++ b/libavcodec/ppc/h264qpel.c @@ -25,7 +25,7 @@ #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/h264qpel.h" -#include "dsputil_altivec.h" +#include "hpeldsp_altivec.h" #if HAVE_ALTIVEC diff --git a/libavcodec/ppc/hpeldsp_altivec.c b/libavcodec/ppc/hpeldsp_altivec.c index d40c5d8cce..92ce52af8d 100644 --- a/libavcodec/ppc/hpeldsp_altivec.c +++ b/libavcodec/ppc/hpeldsp_altivec.c @@ -31,7 +31,7 @@ #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/hpeldsp.h" -#include "dsputil_altivec.h" +#include "hpeldsp_altivec.h" #if HAVE_ALTIVEC /* next one assumes that ((line_size % 16) == 0) */ diff --git a/libavcodec/ppc/hpeldsp_altivec.h b/libavcodec/ppc/hpeldsp_altivec.h new file mode 100644 index 0000000000..98dd80ea1c --- /dev/null +++ b/libavcodec/ppc/hpeldsp_altivec.h @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2002 Brian Foley + * Copyright (c) 2002 Dieter Shirley + * Copyright (c) 2003-2004 Romain Dolbeau + * + * 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 AVCODEC_PPC_HPELDSP_ALTIVEC_H +#define AVCODEC_PPC_HPELDSP_ALTIVEC_H + +#include +#include + +void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); + +#endif /* AVCODEC_PPC_HPELDSP_ALTIVEC_H */ diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c index 2e6d0faeb7..366dc3ccbb 100644 --- a/libavcodec/ppc/vp8dsp_altivec.c +++ b/libavcodec/ppc/vp8dsp_altivec.c @@ -26,7 +26,7 @@ #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" #include "libavcodec/vp8dsp.h" -#include "dsputil_altivec.h" +#include "hpeldsp_altivec.h" #if HAVE_ALTIVEC #define REPT4(...) { __VA_ARGS__, __VA_ARGS__, __VA_ARGS__, __VA_ARGS__ } -- cgit v1.2.3