generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

Browse Source 
* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f':
  x86: dsputil: Move hpeldsp-related declarations to a separate header

Conflicts:
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-22 23:21:54 +01:00
commit 74fed968d1
6 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/x86/dsputil_x86.h
View File

@ -22,7 +22,6 @@
#ifndef AVCODEC_X86_DSPUTIL_X86_H
#define AVCODEC_X86_DSPUTIL_X86_H
#include <stddef.h>
#include <stdint.h>
#include "libavcodec/avcodec.h"
@ -66,19 +65,6 @@ void ff_gmc_sse(uint8_t *dst, uint8_t *src,
void ff_vector_clipf_sse(float *dst, const float *src,
float min, float max, int len);
void ff_avg_pixels8_x2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_avg_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_avg_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_put_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_mmx_idct(int16_t *block);
void ff_mmxext_idct(int16_t *block);

38
libavcodec/x86/hpeldsp.h Normal file
View File

@ -0,0 +1,38 @@
/*
* 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_X86_HPELDSP_H
#define AVCODEC_X86_HPELDSP_H
#include <stddef.h>
#include <stdint.h>
void ff_avg_pixels8_x2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_avg_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_avg_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_put_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
#endif /* AVCODEC_X86_HPELDSP_H */

2
libavcodec/x86/hpeldsp_init.c
View File

@ -29,8 +29,8 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/hpeldsp.h"
#include "libavcodec/pixels.h"
#include "dsputil_x86.h"
#include "fpel.h"
#include "hpeldsp.h"
void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);

2
libavcodec/x86/hpeldsp_mmx.c
View File

@ -24,7 +24,7 @@
#include <stdint.h>
#include "config.h"
#include "dsputil_x86.h"
#include "hpeldsp.h"
#include "inline_asm.h"
#if HAVE_MMX_INLINE

2
libavcodec/x86/rnd_mmx.c
View File

@ -18,7 +18,7 @@
#include "config.h"
#include "libavcodec/pixels.h"
#include "dsputil_x86.h"
#include "hpeldsp.h"
#include "inline_asm.h"
#if HAVE_INLINE_ASM

2
libavcodec/x86/rv40dsp_init.c
View File

@ -30,7 +30,7 @@
#include "libavutil/attributes.h"
#include "libavutil/mem.h"
#include "libavutil/x86/cpu.h"
#include "dsputil_x86.h"
#include "hpeldsp.h"
#if HAVE_YASM
void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src,