ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Sat Jan  2 
19:07:08 2016 +0100| [957667d1985440f01cbeb0dda6b6dd1cf24853e5] | committer: 
Hendrik Leppkes

avutil/cpu: add missing entry for vfp_vm to av_parse_cpu_caps

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

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

diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 89066d8..cd55d3b 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -231,6 +231,7 @@ int av_parse_cpu_caps(unsigned *flags, const char *s)
         { "armv6",    NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV6   
 },    .unit = "flags" },
         { "armv6t2",  NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ARMV6T2 
 },    .unit = "flags" },
         { "vfp",      NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP     
 },    .unit = "flags" },
+        { "vfp_vm",   NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_VFP_VM  
 },    .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" },
         { "setend",   NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_SETEND  
 },    .unit = "flags" },

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

Reply via email to