diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index 65d0b45453..b79f462660 100644
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -48,7 +48,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
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index a0703d2033..f23233934a 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -44,7 +44,7 @@ static const uint16_t table_mb_intra[64][2];
 
 /**
  * Get unary code of limited length
- * @fixme FIXME Slow and ugly
+ * @todo FIXME Slow and ugly
  * @param gb GetBitContext
  * @param[in] stop The bitstop value (unary code of 1's or 0's)
  * @param[in] len Maximum length
@@ -209,7 +209,7 @@ static void decode_rowskip(uint8_t* plane, int width, int height, int stride, Ge
  * @param[in] width Width of this buffer
  * @param[in] height Height of this buffer
  * @param[in] stride of this buffer
- * @fixme FIXME: Optimize
+ * @todo FIXME: Optimize
  */
 static void decode_colskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){
     int x, y;
@@ -229,7 +229,7 @@ static void decode_colskip(uint8_t* plane, int width, int height, int stride, Ge
  * @param bp Bitplane where to store the decode bits
  * @param v VC-1 context for bit reading and logging
  * @return Status
- * @fixme FIXME: Optimize
+ * @todo FIXME: Optimize
  */
 static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v)
 {
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index c57dfff56a..aa61dfaa8c 100644
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -151,7 +151,7 @@ enum COTypes {
 
 
 /** The VC1 Context
- * @fixme Change size wherever another size is more efficient
+ * @todo Change size wherever another size is more efficient
  * Many members are only used for Advanced Profile
  */
 typedef struct VC1Context{