diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-04 07:38:01 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-12 16:51:16 +0200 |
| commit | 145f741e115c75eac511e0ceb7a3c44585e871e3 (patch) | |
| tree | 5a9dae8f2a3de7c1652b85a4ec6242a1f1f2ede6 /libavutil/opt.h | |
| parent | 3b3ea34655db02d9cd9ea1a4122e920a7fdec602 (diff) | |
| download | ffmpeg-145f741e115c75eac511e0ceb7a3c44585e871e3.tar.gz | |
AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
Diffstat (limited to 'libavutil/opt.h')
| -rw-r--r-- | libavutil/opt.h | 13 |
1 files changed, 12 insertions, 1 deletions
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 }; /** |