ffmpeg | branch: release/2.3 | Michael Niedermayer <michae...@gmx.at> | Wed Aug 
 6 13:59:18 2014 +0200| [901e275697dee8a1512540d6d653e38a16103bfa] | committer: 
Michael Niedermayer

avutil/cpu: add aarch64 entries to 2nd table

Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit efc4fe9d74a5040e465dbff80b29468dbc227c19)

Signed-off-by: Michael Niedermayer <michae...@gmx.at>

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

 libavutil/cpu.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 2d40211..e9bfb58 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -225,6 +225,10 @@ int av_parse_cpu_caps(unsigned *flags, const char *s)
         { "vfp",      NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP     
 },    .unit = "flags" },
         { "vfpv3",    NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFPV3   
 },    .unit = "flags" },
         { "neon",     NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_NEON    
 },    .unit = "flags" },
+#elif ARCH_AARCH64
+        { "armv8",    NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV8   
 },    .unit = "flags" },
+        { "neon",     NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_NEON    
 },    .unit = "flags" },
+        { "vfp",      NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP     
 },    .unit = "flags" },
 #endif
         { NULL },
     };

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to