virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

Browse Source 
* commit 'ae116cd3ed908d28b69d5198712217ec743d74f6':
  ppc: dsputil: Move hpeldsp-related declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-22 23:16:41 +01:00
commit 816d7936a7
5 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/ppc/dsputil_altivec.h
View File

@ -27,11 +27,6 @@
#include "libavcodec/dsputil.h" #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_fdct_altivec(int16_t *block);
void ff_gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h, void ff_gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h,
int x16, int y16, int rounder); int x16, int y16, int rounder);

2
libavcodec/ppc/h264qpel.c
View File

@ -25,7 +25,7 @@
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/h264qpel.h" #include "libavcodec/h264qpel.h"
#include "dsputil_altivec.h" #include "hpeldsp_altivec.h"
#if HAVE_ALTIVEC #if HAVE_ALTIVEC

2
libavcodec/ppc/hpeldsp_altivec.c
View File

@ -31,7 +31,7 @@
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/hpeldsp.h" #include "libavcodec/hpeldsp.h"
#include "dsputil_altivec.h" #include "hpeldsp_altivec.h"
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
/* next one assumes that ((line_size % 16) == 0) */ /* next one assumes that ((line_size % 16) == 0) */

34
libavcodec/ppc/hpeldsp_altivec.h Normal file
View File

@ -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 */

2
libavcodec/ppc/vp8dsp_altivec.c
View File

@ -26,7 +26,7 @@
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/vp8dsp.h" #include "libavcodec/vp8dsp.h"
#include "dsputil_altivec.h" #include "hpeldsp_altivec.h"
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
#define REPT4(...) { __VA_ARGS__, __VA_ARGS__, __VA_ARGS__, __VA_ARGS__ } #define REPT4(...) { __VA_ARGS__, __VA_ARGS__, __VA_ARGS__, __VA_ARGS__ }