diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 22:09:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 22:23:26 +0200 |
| commit | 013172ae9f1ab35b70732dcab6385743c5fed876 (patch) | |
| tree | 6ce7145261fa147a88ab804362fa81a876b7f1cc /libavcodec/libxvid.c | |
| parent | 016cca45047483f508c05aa10d9448f6fcb6de0a (diff) | |
| parent | 67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3 (diff) | |
Merge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3'
* commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3':
libxvid: Drop PPC-specific CPU detection hack
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libxvid.c')
| -rw-r--r-- | libavcodec/libxvid.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index e60b2d8f9d..3ec9524c93 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -445,19 +445,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { 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 (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 */ xvid_global(NULL, XVID_GBL_INIT, &xvid_gbl_init, NULL); |