[FFmpeg-cvslog] avutil/ppc/cpu: Fix power8 linux detection
Lauri Kasanen
git at videolan.org
Tue Feb 5 09:27:46 EET 2019
ffmpeg | branch: master | Lauri Kasanen <cand at gmx.com> | Tue Jan 8 10:59:22 2019 +0200| [fc6022e1088df068b72159e8836c59643795e39e] | committer: Lauri Kasanen
avutil/ppc/cpu: Fix power8 linux detection
The existing code was in no released kernel that I can see. The corrected code
was added in 3.9.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc6022e1088df068b72159e8836c59643795e39e
---
libavutil/ppc/cpu.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavutil/ppc/cpu.c b/libavutil/ppc/cpu.c
index 7bb7cd813c..b022149fa0 100644
--- a/libavutil/ppc/cpu.c
+++ b/libavutil/ppc/cpu.c
@@ -93,13 +93,13 @@ int ff_get_cpu_flags_ppc(void)
if (buf[i + 1] & PPC_FEATURE_HAS_VSX)
ret |= AV_CPU_FLAG_VSX;
#endif
-#ifdef PPC_FEATURE_ARCH_2_07
- if (buf[i + 1] & PPC_FEATURE_HAS_POWER8)
- ret |= AV_CPU_FLAG_POWER8;
-#endif
if (ret & AV_CPU_FLAG_VSX)
av_assert0(ret & AV_CPU_FLAG_ALTIVEC);
- goto out;
+ } else if (buf[i] == AT_HWCAP2) {
+#ifdef PPC_FEATURE2_ARCH_2_07
+ if (buf[i + 1] & PPC_FEATURE2_ARCH_2_07)
+ ret |= AV_CPU_FLAG_POWER8;
+#endif
}
}
}
More information about the ffmpeg-cvslog
mailing list