Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / cpu.h

diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index ff0c2e64ac1e72f3573d9555125ee7b0e4e7d981..da93fb5f69b9e2abed9135340533a189a88dca74 100644 (file)
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -46,9 +46,16 @@
  */
 int av_get_cpu_flags(void);
 
+
+/**
+ * Disables cpu detection and forces the specified flags.
+ */
+void av_force_cpu_flags(int flags);
+
+
 /* The following CPU-specific functions shall not be called directly. */
 int ff_get_cpu_flags_arm(void);
 int ff_get_cpu_flags_ppc(void);
 int ff_get_cpu_flags_x86(void);
 
-#endif  /* AVUTIL_CPU_H */
+#endif /* AVUTIL_CPU_H */