RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3' 

* commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3':
  libxvid: Drop PPC-specific CPU detection hack

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-22 22:09:39 +02:00
parent 016cca4504 67bc1ba5d7
commit 013172ae9f
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/libxvid.c
View File

@ -445,19 +445,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) {
xvid_gbl_init.version = XVID_VERSION; xvid_gbl_init.version = XVID_VERSION;
xvid_gbl_init.debug = 0; xvid_gbl_init.debug = 0;
#if ARCH_PPC
/* Xvid's PPC support is borked, use libavcodec to detect */
#if HAVE_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; xvid_gbl_init.cpu_flags = 0;
#endif
/* Initialize */ /* Initialize */
xvid_global(NULL, XVID_GBL_INIT, &xvid_gbl_init, NULL); xvid_global(NULL, XVID_GBL_INIT, &xvid_gbl_init, NULL);