From 145f741e115c75eac511e0ceb7a3c44585e871e3 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 4 Oct 2011 07:38:01 +0200
Subject: AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*

---
 libavutil/opt.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'libavutil/opt.h')

diff --git a/libavutil/opt.h b/libavutil/opt.h
index e30f0123ec..6d189b876d 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -33,7 +33,17 @@
 #include "log.h"
 
 enum AVOptionType{
-    FF_OPT_TYPE_FLAGS,
+    AV_OPT_TYPE_FLAGS,
+    AV_OPT_TYPE_INT,
+    AV_OPT_TYPE_INT64,
+    AV_OPT_TYPE_DOUBLE,
+    AV_OPT_TYPE_FLOAT,
+    AV_OPT_TYPE_STRING,
+    AV_OPT_TYPE_RATIONAL,
+    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
+    AV_OPT_TYPE_CONST = 128,
+#if FF_API_OLD_AVOPTIONS
+    FF_OPT_TYPE_FLAGS = 0,
     FF_OPT_TYPE_INT,
     FF_OPT_TYPE_INT64,
     FF_OPT_TYPE_DOUBLE,
@@ -42,6 +52,7 @@ enum AVOptionType{
     FF_OPT_TYPE_RATIONAL,
     FF_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
     FF_OPT_TYPE_CONST=128,
+#endif
 };
 
 /**
-- 
cgit v1.2.3