ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavcodec/libxvidff.c

 /*
  * Interface to xvidcore for mpeg4 encoding
  * Copyright (c) 2004 Adam Thayer <krevnik@comcast.net>
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
@@ skipping 13 matching lines @@
  * Interface to xvidcore for MPEG-4 compliant encoding.
  * @author Adam Thayer (krevnik@comcast.net)
  */
 
 /* needed for mkstemp() */
 #define _XOPEN_SOURCE 600
 
 #include <xvid.h>
 #include <unistd.h>
 #include "avcodec.h"
+#include "libavutil/cpu.h"
 #include "libavutil/intreadwrite.h"
 #include "libxvid_internal.h"
 #if !HAVE_MKSTEMP
 #include <fcntl.h>
 #endif
 
 /**
  * Buffer management macros.
  */
 #define BUFFER_SIZE                 1024
 #define BUFFER_REMAINING(x)         (BUFFER_SIZE - strlen(x))
 #define BUFFER_CAT(x)               (&((x)[strlen(x)]))
 
-/* For PPC Use */
-int has_altivec(void);
-
 /**
  * Structure for the private Xvid context.
  * This stores all the private context for the codec.
  */
 struct xvid_context {
     void *encoder_handle;          /**< Handle for Xvid encoder */
     int xsize;                     /**< Frame x size */
     int ysize;                     /**< Frame y size */
     int vop_flags;                 /**< VOP flags for Xvid encoder */
     int vol_flags;                 /**< VOL flags for Xvid encoder */
@@ skipping 148 matching lines @@
             x->me_flags |= XVID_ME_QUARTERPELREFINE8;
     }
 
     memset(&xvid_gbl_init, 0, sizeof(xvid_gbl_init));
     xvid_gbl_init.version = XVID_VERSION;
     xvid_gbl_init.debug = 0;
 
 #if ARCH_PPC
     /* Xvid's PPC support is borked, use libavcodec to detect */
 #if HAVE_ALTIVEC
-    if( has_altivec() ) {
+    if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) {
         xvid_gbl_init.cpu_flags = XVID_CPU_FORCE | XVID_CPU_ALTIVEC;
     } else
 #endif
         xvid_gbl_init.cpu_flags = XVID_CPU_FORCE;
 #else
     /* Xvid can detect on x86 */
     xvid_gbl_init.cpu_flags = 0;
 #endif
 
     /* Initialize */
@@ skipping 589 matching lines @@
     CODEC_ID_MPEG4,
     sizeof(struct xvid_context),
     xvid_encode_init,
     xvid_encode_frame,
     xvid_encode_close,
     .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"),
 };
 
 #endif /* CONFIG_LIBXVID_ENCODER */