Commit a8873721 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1399931d'

* commit '1399931d':
  x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

Conflicts:
	libavcodec/x86/dsputil_mmx.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b2da63db 1399931d
......@@ -41,7 +41,7 @@
#include "libavutil/imgutils.h"
#if HAVE_MMX_EXTERNAL
#include "x86/dsputil_mmx.h"
#include "x86/dsputil_x86.h"
#endif
#define FF_COLOR_NA -1
......
......@@ -22,7 +22,7 @@
#include "libavutil/mem.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#include "libavcodec/ac3.h"
#include "libavcodec/ac3dsp.h"
......
......@@ -29,7 +29,7 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/cavsdsp.h"
#include "constants.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#include "config.h"
#if HAVE_MMX_INLINE
......
......@@ -21,7 +21,7 @@
*/
#include "libavutil/x86/asm.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#include "dirac_dwt.h"
#define COMPOSE_VERTICAL(ext, align) \
......
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#include "diracdsp_mmx.h"
void ff_put_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height);
......
......@@ -25,7 +25,7 @@
#include "libavutil/x86/asm.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/simple_idct.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#include "idct_xvid.h"
void ff_put_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
......
......@@ -28,7 +28,7 @@
#include "libavutil/x86/asm.h"
#include "libavcodec/videodsp.h"
#include "constants.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#include "diracdsp_mmx.h"
#if HAVE_INLINE_ASM
......
......@@ -30,7 +30,7 @@
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
#include "libavcodec/mathops.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size);
void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, int line_size);
......
......@@ -25,7 +25,7 @@
#include <stdint.h>
#include "config.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_MMX_INLINE
......
......@@ -25,7 +25,7 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/h264qpel.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_YASM
void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,
......
......@@ -23,7 +23,7 @@
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavcodec/h264dsp.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
/***********************************/
/* IDCT */
......
......@@ -25,7 +25,7 @@
#include "libavutil/cpu.h"
#include "libavutil/x86/asm.h"
#include "libavcodec/hpeldsp.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
......
......@@ -24,7 +24,7 @@
#include <stdint.h>
#include "config.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_MMX_INLINE
......
......@@ -44,7 +44,7 @@
#include "config.h"
#include "libavcodec/avcodec.h"
#include "libavutil/mem.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#include "idct_xvid.h"
#if HAVE_INLINE_ASM
......
......@@ -41,7 +41,7 @@
#include "libavutil/mem.h"
#include "libavutil/x86/asm.h"
#include "idct_xvid.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_INLINE_ASM
......
......@@ -26,7 +26,7 @@
#include "libavutil/avassert.h"
#include "libavutil/mem.h"
#include "libavutil/x86/asm.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_INLINE_ASM
......
......@@ -24,7 +24,7 @@
#include "libavutil/x86/asm.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_INLINE_ASM
......
......@@ -26,7 +26,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/dct.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
extern uint16_t ff_inv_zigzag_direct16[64];
......
......@@ -17,7 +17,7 @@
*/
#include "config.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_INLINE_ASM
......
......@@ -30,7 +30,7 @@
#include "libavutil/attributes.h"
#include "libavutil/mem.h"
#include "libavutil/x86/cpu.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_YASM
void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src,
......
......@@ -21,7 +21,7 @@
*/
#include "libavcodec/simple_idct.h"
#include "libavutil/mem.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_INLINE_ASM
......
......@@ -24,7 +24,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/snow.h"
#include "libavcodec/snow_dwt.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#if HAVE_INLINE_ASM
......
......@@ -27,7 +27,7 @@
#include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h"
#include "libavcodec/vc1dsp.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#include "vc1dsp.h"
#include "config.h"
......
......@@ -30,7 +30,7 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/vc1dsp.h"
#include "constants.h"
#include "dsputil_mmx.h"
#include "dsputil_x86.h"
#include "vc1dsp.h"
#if HAVE_INLINE_ASM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment