diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:16:41 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:17:03 +0100 |
commit | 816d7936a714b050a86cd376c9dd0c175a6fd9fa (patch) | |
tree | 83858c676a94313ba6755723cc9c1ccf15f43a6b | |
parent | 9333bba6ed3212ac14aa5e578f8ae8ad279b36c3 (diff) | |
parent | ae116cd3ed908d28b69d5198712217ec743d74f6 (diff) | |
download | ffmpeg-816d7936a714b050a86cd376c9dd0c175a6fd9fa.tar.gz |
Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'
* commit 'ae116cd3ed908d28b69d5198712217ec743d74f6':
ppc: dsputil: Move hpeldsp-related declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/ppc/dsputil_altivec.h | 5 | ||||
-rw-r--r-- | libavcodec/ppc/h264qpel.c | 2 | ||||
-rw-r--r-- | libavcodec/ppc/hpeldsp_altivec.c | 2 | ||||
-rw-r--r-- | libavcodec/ppc/hpeldsp_altivec.h | 34 | ||||
-rw-r--r-- | libavcodec/ppc/vp8dsp_altivec.c | 2 |
5 files changed, 37 insertions, 8 deletions
diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h index dc4da0b388..cdbfc35ac3 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 1f50ec9929..4147767728 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 345ec39b95..d82a703265 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..590809f539 --- /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 <romain@dolbeau.org> + * + * 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 AVCODEC_PPC_HPELDSP_ALTIVEC_H +#define AVCODEC_PPC_HPELDSP_ALTIVEC_H + +#include <stddef.h> +#include <stdint.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); + +#endif /* AVCODEC_PPC_HPELDSP_ALTIVEC_H */ diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c index c858d8a45f..bee182a5a4 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__ } |