summaryrefslogtreecommitdiff
path: root/contrib/ffmpeg/libavcodec/opt.h
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ffmpeg/libavcodec/opt.h')
-rw-r--r--contrib/ffmpeg/libavcodec/opt.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/contrib/ffmpeg/libavcodec/opt.h b/contrib/ffmpeg/libavcodec/opt.h
index 151dbb788..4691d1dfb 100644
--- a/contrib/ffmpeg/libavcodec/opt.h
+++ b/contrib/ffmpeg/libavcodec/opt.h
@@ -19,14 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVOPT_H
-#define AVOPT_H
+#ifndef FFMPEG_OPT_H
+#define FFMPEG_OPT_H
/**
* @file opt.h
* AVOptions
*/
+#include "libavutil/rational.h"
+
enum AVOptionType{
FF_OPT_TYPE_FLAGS,
FF_OPT_TYPE_INT,
@@ -35,6 +37,7 @@ enum AVOptionType{
FF_OPT_TYPE_FLOAT,
FF_OPT_TYPE_STRING,
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,
};
@@ -46,7 +49,7 @@ typedef struct AVOption {
/**
* short English text help.
- * @fixme what about other languages
+ * @todo what about other languages
*/
const char *help;
int offset; ///< offset to context structure where the parsed value should be stored
@@ -82,4 +85,4 @@ int av_opt_show(void *obj, void *av_log_obj);
void av_opt_set_defaults(void *s);
void av_opt_set_defaults2(void *s, int mask, int flags);
-#endif
+#endif /* FFMPEG_OPT_H */