highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove pointless HAVE_ALTIVEC #ifdefs from a file that only contains AltiVec

Browse Source 
optimizations and no general PPC optimizations. Instead make the file be
compiled conditional to HAVE_ALTIVEC.

Originally committed as revision 10637 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2007-10-02 10:22:22 +00:00
parent 3303926c2f
commit 465c9fdeeb
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@@ -394,7 +394,6 @@ ASM_OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \
alpha/motion_est_mvi_asm.o \ alpha/motion_est_mvi_asm.o \
OBJS-$(ARCH_POWERPC) += ppc/dsputil_ppc.o \ OBJS-$(ARCH_POWERPC) += ppc/dsputil_ppc.o \
ppc/mpegvideo_ppc.o \
OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \ OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \
ps2/idct_mmi.o \ ps2/idct_mmi.o \
@@ -412,6 +411,7 @@ OBJS-$(HAVE_ALTIVEC) += ppc/dsputil_altivec.o \
ppc/idct_altivec.o \ ppc/idct_altivec.o \
ppc/int_altivec.o \ ppc/int_altivec.o \
ppc/mpegvideo_altivec.o \ ppc/mpegvideo_altivec.o \
ppc/mpegvideo_ppc.o \
ifeq ($(HAVE_ALTIVEC),yes) ifeq ($(HAVE_ALTIVEC),yes)
OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o

11
libavcodec/ppc/mpegvideo_ppc.c
View File

@@ -21,10 +21,7 @@
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include <time.h> #include <time.h>
#ifdef HAVE_ALTIVEC
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#endif
extern int dct_quantize_altivec(MpegEncContext *s, extern int dct_quantize_altivec(MpegEncContext *s,
DCTELEM *block, int n, DCTELEM *block, int n,
@@ -38,9 +35,6 @@ extern void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block);
void MPV_common_init_ppc(MpegEncContext *s) void MPV_common_init_ppc(MpegEncContext *s)
{ {
#ifdef HAVE_ALTIVEC
if (has_altivec())
{
if (s->avctx->lowres==0) if (s->avctx->lowres==0)
{ {
if ((s->avctx->idct_algo == FF_IDCT_AUTO) || if ((s->avctx->idct_algo == FF_IDCT_AUTO) ||
@@ -78,10 +72,5 @@ void MPV_common_init_ppc(MpegEncContext *s)
s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec; s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec;
s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec; s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec;
} }
} else
#endif
{
/* Non-AltiVec PPC optimisations here */
}
} }