diff --git a/cmdutils.h b/cmdutils.h
index 55a06dd096abfb004c04184d965f5b73b4ee3e78..fc438c7977de83e42761a7e86961a989692ef20c 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -190,7 +190,7 @@ void parse_loglevel(int argc, char **argv, const OptionDef *options);
  *
  * @param s  Corresponding format context.
  * @param st Stream from s to be checked.
- * @param spec A stream specifier of the [v|a|s|d]:[<stream index>] form.
+ * @param spec A stream specifier of the [v|a|s|d]:[\<stream index\>] form.
  *
  * @return 1 if the stream matches, 0 if it doesn't, <0 on error
  */
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 9cf38edb8e56bdb7386bea3af4103dbc0bf6ae61..08ab05f8bb1280a664a1fc8dbd16ef41c55258f9 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -22,10 +22,11 @@
 /**
  * @file
  * Cinepak video decoder
- * by Ewald Snel <ewald@rambo.its.tudelft.nl>
- * For more information on the Cinepak algorithm, visit:
+ * @author Ewald Snel <ewald@rambo.its.tudelft.nl>
+ *
+ * @see For more information on the Cinepak algorithm, visit:
  *   http://www.csse.monash.edu.au/~timf/
- * For more information on the quirky data inside Sega FILM/CPK files, visit:
+ * @see For more information on the quirky data inside Sega FILM/CPK files, visit:
  *   http://wiki.multimedia.cx/index.php?title=Sega_FILM
  */
 
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index 772fb2844016ab99bb324971275812e6d14c52ff..c5aa6ace7931d74439bca4378f1671978114f053 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -22,9 +22,9 @@
 /**
  * @file
  * Electronic Arts Madcow Video Decoder
- * by Peter Ross <pross@xvid.org>
+ * @author Peter Ross <pross@xvid.org>
  *
- * Technical details here:
+ * @see technical details at
  * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_MAD
  */
 
diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c
index 834346bc25eb65e14f0428116dd11016e543c800..2adc9cfa39b9a0f49ec800a43b5525576434134a 100644
--- a/libavcodec/lsp.c
+++ b/libavcodec/lsp.c
@@ -75,7 +75,7 @@ void ff_acelp_lsf2lspd(double *lsp, const float *lsf, int lp_order)
 
 /**
  * @brief decodes polynomial coefficients from LSP
- * @param f [out] decoded polynomial coefficients (-0x20000000 <= (3.22) <= 0x1fffffff)
+ * @param[out] f decoded polynomial coefficients (-0x20000000 <= (3.22) <= 0x1fffffff)
  * @param lsp LSP coefficients (-0x8000 <= (0.15) <= 0x7fff)
  */
 static void lsp2poly(int* f, const int16_t* lsp, int lp_half_order)
diff --git a/libavdevice/pulse.c b/libavdevice/pulse.c
index 7f7c6dc2ff5c14db01fb2d1217beeb82a7731f4f..bffe3914b8107c3ac181088fae5904dd7b2ee2b2 100644
--- a/libavdevice/pulse.c
+++ b/libavdevice/pulse.c
@@ -23,7 +23,6 @@
  * @file
  * PulseAudio input using the simple API.
  * @author Luca Barbato <lu_zero@gentoo.org>
- *
  */
 
 #include <pulse/simple.h>
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 5673e5e611c113da5d8a964fbc5679a49b794801..9d12b2f731e1571b4172dee29fda2a55d28fdc96 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -31,8 +31,9 @@
 
 /**
  * @file
- * X11 frame device demuxer by Clemens Fruhwirth <clemens@endorphin.org>
- * and Edouard Gomez <ed.gomez@free.fr>.
+ * X11 frame device demuxer
+ * @author Clemens Fruhwirth <clemens@endorphin.org>
+ * @author Edouard Gomez <ed.gomez@free.fr>
  */
 
 #include "config.h"
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 6fdad8b9fce568f484d11c1d12354dfe5508aa84..b61c819ce33c7be5f446fb0ffccb89df425ad108 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -22,10 +22,10 @@
 /**
  * @file
  * Matroska file demuxer
- * by Ronald Bultje <rbultje@ronald.bitfreak.net>
- * with a little help from Moritz Bunkus <moritz@bunkus.org>
- * totally reworked by Aurelien Jacobs <aurel@gnuage.org>
- * Specs available on the Matroska project page: http://www.matroska.org/.
+ * @author Ronald Bultje <rbultje@ronald.bitfreak.net>
+ * @author with a little help from Moritz Bunkus <moritz@bunkus.org>
+ * @author totally reworked by Aurelien Jacobs <aurel@gnuage.org>
+ * @see specs available on the Matroska project page: http://www.matroska.org/
  */
 
 #include <stdio.h>
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index c22f2bed609735d9eb43c60aaab37b4fe6b90e20..36e2c452da4672899992b7d915cfa74c86bab88e 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -2,10 +2,9 @@
  * Ogg bitstream support
  * Luca Barbato <lu_zero@gentoo.org>
  * Based on tcvp implementation
- *
  */
 
-/**
+/*
     Copyright (C) 2005  Michael Ahlberg, Måns Rullgård
 
     Permission is hereby granted, free of charge, to any person
@@ -27,7 +26,7 @@
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
     DEALINGS IN THE SOFTWARE.
-**/
+ */
 
 
 #include <stdio.h>