vis detection patch by (James Morrison <ja2morri at csclub dot uwaterloo dot ca>)

Originally committed as revision 3057 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
James Morrison 21 years ago committed by Michael Niedermayer
parent aab9cdcff8
commit bb476ff367
  1. 10
      configure
  2. 8
      libavcodec/Makefile
  3. 4
      libavcodec/common.h
  4. 4
      libavformat/Makefile

10
configure vendored

@ -115,9 +115,12 @@ case "$cpu" in
mips)
cpu="mips"
;;
sun4u)
sun4u|sparc64)
cpu="sparc64"
;;
sparc)
cpu="sparc"
;;
sh4)
cpu="sh4"
;;
@ -1026,6 +1029,11 @@ elif test "$cpu" = "alpha" ; then
elif test "$cpu" = "sparc64" ; then
echo "TARGET_ARCH_SPARC64=yes" >> config.mak
echo "#define ARCH_SPARC64 1" >> $TMPH
echo "TARGET_ARCH_SPARC=yes" >> config.mak
echo "#define ARCH_SPARC 1" >> $TMPH
elif test "$cpu" = "sparc" ; then
echo "TARGET_ARCH_SPARC=yes" >> config.mak
echo "#define ARCH_SPARC 1" >> $TMPH
elif test "$cpu" = "powerpc" ; then
echo "TARGET_ARCH_POWERPC=yes" >> config.mak
echo "#define ARCH_POWERPC 1" >> $TMPH

@ -161,12 +161,15 @@ ifeq ($(TARGET_ARCH_SH4),yes)
OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o
endif
ifeq ($(TARGET_ARCH_SPARC64),yes)
ifeq ($(TARGET_ARCH_SPARC),yes)
OBJS+=sparc/dsputil_vis.o
sparc/%.o: sparc/%.c
$(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
endif
ifeq ($(TARGET_ARCH_SPARC64),yes)
CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
endif
SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
OBJS := $(OBJS) $(ASM_OBJS)
@ -220,6 +223,7 @@ clean: $(CLEANAMR)
ppc/*.o ppc/*~ \
ps2/*.o ps2/*~ \
sh4/*.o sh4/*~ \
sparc/*.o sparc/*~ \
liba52/*.o liba52/*~ \
apiexample $(TESTS)
$(MAKE) -C libpostproc clean

@ -372,7 +372,7 @@ typedef struct RL_VLC_ELEM {
uint8_t run;
} RL_VLC_ELEM;
#ifdef ARCH_SPARC64
#ifdef ARCH_SPARC
#define UNALIGNED_STORES_ARE_BAD
#endif
@ -423,7 +423,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value)
bit_buf<<=bit_left;
bit_buf |= value >> (n - bit_left);
#ifdef UNALIGNED_STORES_ARE_BAD
if (3 & (int) s->buf_ptr) {
if (3 & (intptr_t) s->buf_ptr) {
s->buf_ptr[0] = bit_buf >> 24;
s->buf_ptr[1] = bit_buf >> 16;
s->buf_ptr[2] = bit_buf >> 8;

@ -70,6 +70,10 @@ ifeq ($(CONFIG_VORBIS),yes)
OBJS+= ogg.o
endif
ifeq ($(TARGET_ARCH_SPARC64),yes)
CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
endif
LIB= $(LIBPREF)avformat$(LIBSUF)
ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avformat$(SLIBSUF)

Loading…
Cancel
Save