X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fopt.h;h=284d0b0828bed2b2b98110af13067bf923844899;hb=9389e63c838d03ae9b0688b7957a994b9a2bd61c;hp=65d0b4545309d9801260efb308fbfbca9a3646dc;hpb=99545457bf1175d55e4eaa2c061dbf0faeb661ec;p=ffmpeg

diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index 65d0b454530..284d0b0828b 100644
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -19,8 +19,8 @@
  * 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
@@ -37,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,
 };
 
@@ -48,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
@@ -84,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 */