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

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

Browse Source 
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
  Remove unnecessary dsputil.h #includes

Conflicts:
	libavcodec/ffv1.c
	libavcodec/h261dec.c
	libavcodec/h261enc.c
	libavcodec/h264pred.c
	libavcodec/lpc.h
	libavcodec/mjpegdec.c
	libavcodec/rectangle.h
	libavcodec/x86/idct_sse2_xvid.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-26 13:05:10 +01:00
parent 9b1a0c2ee8 c242bbd8b6
commit a984efd104
120 changed files with 5 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/ppc/dsputil_ppc.c
View File

@@ -25,7 +25,6 @@
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/mem.h"
#include "libavcodec/dsputil.h"
#include "dsputil_altivec.h"
/* ***** WARNING ***** WARNING ***** WARNING ***** */

1
libavcodec/ppc/fdct_altivec.c
View File

@@ -23,7 +23,6 @@
#include <altivec.h>
#endif
#include "libavutil/common.h"
#include "libavcodec/dsputil.h"
#include "dsputil_altivec.h"
#define vs16(v) ((vector signed short)(v))

1
libavcodec/ppc/gmc_altivec.c
View File

@@ -23,7 +23,6 @@
#include "libavutil/mem.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/dsputil.h"
#include "dsputil_altivec.h"
/*

1
libavcodec/ppc/idct_altivec.c
View File

@@ -42,7 +42,6 @@
#include <altivec.h>
#endif
#include "libavutil/ppc/types_altivec.h"
#include "libavcodec/dsputil.h"
#include "dsputil_altivec.h"
#define IDCT_HALF \

1
libavcodec/ppc/mpegvideo_altivec.c
View File

@@ -28,7 +28,6 @@
#include "libavutil/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_altivec.h"

1
libavcodec/ppc/vc1dsp_altivec.c
View File

@@ -22,7 +22,6 @@
#include "libavutil/attributes.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/vc1dsp.h"
// main steps of 8x8 transform

1
libavcodec/ppc/vp3dsp_altivec.c
View File

@@ -29,7 +29,6 @@
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/dsputil.h"
#include "dsputil_altivec.h"
static const vec_s16 constants =