Commit 9ec7458d authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

Remove reference to not anymore existing symbol has_altivec and use

mm_support instead.

Fix compilation if altivec is present and libxvidff.c is compiled.

Originally committed as revision 25075 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 539ff40c
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <xvid.h> #include <xvid.h>
#include <unistd.h> #include <unistd.h>
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libxvid_internal.h" #include "libxvid_internal.h"
#if !HAVE_MKSTEMP #if !HAVE_MKSTEMP
...@@ -44,9 +45,6 @@ ...@@ -44,9 +45,6 @@
#define BUFFER_REMAINING(x) (BUFFER_SIZE - strlen(x)) #define BUFFER_REMAINING(x) (BUFFER_SIZE - strlen(x))
#define BUFFER_CAT(x) (&((x)[strlen(x)])) #define BUFFER_CAT(x) (&((x)[strlen(x)]))
/* For PPC Use */
int has_altivec(void);
/** /**
* Structure for the private Xvid context. * Structure for the private Xvid context.
* This stores all the private context for the codec. * This stores all the private context for the codec.
...@@ -215,7 +213,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { ...@@ -215,7 +213,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
#if ARCH_PPC #if ARCH_PPC
/* Xvid's PPC support is borked, use libavcodec to detect */ /* Xvid's PPC support is borked, use libavcodec to detect */
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
if( has_altivec() ) { if (mm_support() & AV_CPU_FLAG_ALTIVEC) {
xvid_gbl_init.cpu_flags = XVID_CPU_FORCE | XVID_CPU_ALTIVEC; xvid_gbl_init.cpu_flags = XVID_CPU_FORCE | XVID_CPU_ALTIVEC;
} else } else
#endif #endif
......
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