[FFmpeg-cvslog] libavutil/ppc/cpu.c: check that AT_HWCAP2 is defined

Sean McGovern git at videolan.org
Sun Apr 14 23:24:19 EEST 2024


ffmpeg | branch: release/4.2 | Sean McGovern <gseanmcg at gmail.com> | Sat Oct 14 23:27:24 2023 -0400| [806acf032059d51da4d170e7d9356fa79b457866] | committer: Michael Niedermayer

libavutil/ppc/cpu.c: check that AT_HWCAP2 is defined

It was not introduced until glibc 2.18.

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit d799ad24045f2ae005c8b4c90bee5330ff15fea8)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=806acf032059d51da4d170e7d9356fa79b457866
---

 libavutil/ppc/cpu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavutil/ppc/cpu.c b/libavutil/ppc/cpu.c
index b022149fa0..9229b83072 100644
--- a/libavutil/ppc/cpu.c
+++ b/libavutil/ppc/cpu.c
@@ -95,12 +95,15 @@ int ff_get_cpu_flags_ppc(void)
 #endif
                 if (ret & AV_CPU_FLAG_VSX)
                     av_assert0(ret & AV_CPU_FLAG_ALTIVEC);
-            } else if (buf[i] == AT_HWCAP2) {
+            }
+#ifdef AT_HWCAP2 /* not introduced until glibc 2.18 */
+            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
             }
+#endif /* AT_HWCAP2 */
         }
     }
 



More information about the ffmpeg-cvslog mailing list