diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 78b616fdf4..7ba2b318e3 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -28,7 +28,6 @@
  * Supports: PAL8 (RGB 8bpp, paletted)
  *         : BGR24 (RGB 24bpp) (can also output it as RGB32)
  *         : RGB32 (RGB 32bpp, 4th plane is probably alpha and it's ignored)
- *
  */
 
 #include <stdio.h>
diff --git a/libavcodec/acelp_filters.h b/libavcodec/acelp_filters.h
index 6a9ebd943e..2be4c24395 100644
--- a/libavcodec/acelp_filters.h
+++ b/libavcodec/acelp_filters.h
@@ -49,7 +49,6 @@ extern const int16_t ff_acelp_interp_filter[61];
  * filter_coeffs contains coefficients of the right half of the symmetric
  * interpolation filter. filter_coeffs[0] should the central (unpaired) coefficient.
  * See ff_acelp_interp_filter for an example.
- *
  */
 void ff_acelp_interpolate(int16_t* out, const int16_t* in,
                           const int16_t* filter_coeffs, int precision,
diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index bf679e82d9..f1fbcc09ea 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -138,7 +138,6 @@ static int decode_mime_header(AMRWBContext *ctx, const uint8_t *buf)
  *
  * @param[in]  ind                 Array of 5 indexes
  * @param[out] isf_q               Buffer for isf_q[LP_ORDER]
- *
  */
 static void decode_isf_indices_36b(uint16_t *ind, float *isf_q)
 {
@@ -165,7 +164,6 @@ static void decode_isf_indices_36b(uint16_t *ind, float *isf_q)
  *
  * @param[in]  ind                 Array of 7 indexes
  * @param[out] isf_q               Buffer for isf_q[LP_ORDER]
- *
  */
 static void decode_isf_indices_46b(uint16_t *ind, float *isf_q)
 {
@@ -199,7 +197,6 @@ static void decode_isf_indices_46b(uint16_t *ind, float *isf_q)
  *
  * @param[in,out] isf_q            Current quantized ISF
  * @param[in,out] isf_past         Past quantized ISF
- *
  */
 static void isf_add_mean_and_past(float *isf_q, float *isf_past)
 {
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 12458abd78..3deefb04df 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -74,7 +74,6 @@
  * @{
  * @}
  * @}
- *
  */
 
 /**
@@ -1946,7 +1945,6 @@ typedef struct AVCodecContext {
 #endif
 
     /**
-     *
      * - encoding: Set by user.
      * - decoding: unused
      */
@@ -1988,7 +1986,6 @@ typedef struct AVCodecContext {
 #endif
 
     /**
-     *
      * Note: Value depends upon the compare function used for fullpel ME.
      * - encoding: Set by user.
      * - decoding: unused
@@ -2870,21 +2867,18 @@ typedef struct AVCodecContext {
 #define FF_LEVEL_UNKNOWN -99
 
     /**
-     *
      * - encoding: unused
      * - decoding: Set by user.
      */
     enum AVDiscard skip_loop_filter;
 
     /**
-     *
      * - encoding: unused
      * - decoding: Set by user.
      */
     enum AVDiscard skip_idct;
 
     /**
-     *
      * - encoding: unused
      * - decoding: Set by user.
      */
@@ -3716,7 +3710,6 @@ void av_packet_move_ref(AVPacket *dst, AVPacket *src);
  * @param src Source packet
  *
  * @return 0 on success AVERROR on failure.
- *
  */
 int av_packet_copy_props(AVPacket *dst, const AVPacket *src);
 
@@ -4567,7 +4560,6 @@ AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f);
  *
  * Same behaviour av_fast_malloc but the buffer has additional
  * AV_INPUT_PADDING_SIZE at the end which will always memset to 0.
- *
  */
 void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
 
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index 7df0648a9b..a96c9f5a2c 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -158,7 +158,6 @@ const uint8_t ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63] = {
 };
 
 /**
- *
  * @param buf_size size of buf in bits
  */
 void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size){
diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h
index 428457cea8..beb5016396 100644
--- a/libavcodec/cabac_functions.h
+++ b/libavcodec/cabac_functions.h
@@ -154,7 +154,6 @@ static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
 #endif
 
 /**
- *
  * @return the number of bytes read or 0 if no end
  */
 static int av_unused get_cabac_terminate(CABACContext *c){
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c
index fac695843c..3050b9adc5 100644
--- a/libavcodec/cavs.c
+++ b/libavcodec/cavs.c
@@ -104,7 +104,6 @@ static inline int get_bs(cavs_vector *mvP, cavs_vector *mvQ, int b)
  * | 6 | 7 |
  * 1   3   |
  * ---------
- *
  */
 void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type)
 {
diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h
index 611b529311..741325ac9d 100644
--- a/libavcodec/error_resilience.h
+++ b/libavcodec/error_resilience.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 1a5d3fc93f..089efcc041 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -418,7 +418,6 @@ static void remove_short_at_index(H264Context *h, int i)
 }
 
 /**
- *
  * @return the removed picture or NULL if an error occurs
  */
 static H264Picture *remove_short(H264Context *h, int frame_num, int ref_mask)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 48d520b2a0..8dde140713 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1795,7 +1795,6 @@ static av_always_inline void fill_filter_caches_inter(const H264Context *h,
 }
 
 /**
- *
  * @return non zero if the loop filter can be skipped
  */
 static int fill_filter_caches(const H264Context *h, H264SliceContext *sl, int mb_type)
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 498fdd578e..803ee9c8ff 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -27,7 +27,6 @@
  *  A mdct based codec using a 256 points large transform
  *  divided into 32 bands with some mix of scale factors.
  *  Only mono is supported.
- *
  */
 
 
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index ac13a1964d..30eca62157 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -35,7 +35,6 @@
  *   http://www.pcisys.net/~melanson/codecs
  *
  * Supports: BGR24 (RGB 24bpp)
- *
  */
 
 #include <stdio.h>
diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index a73f6d6fed..e2fc554a2f 100644
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -35,7 +35,6 @@
  *   http://www.pcisys.net/~melanson/codecs
  *
  * Supports: BGR24 (RGB 24bpp)
- *
  */
 
 #include <stdio.h>
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 657c28a02d..aa8b3226f7 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -1684,7 +1684,6 @@ void ff_fix_long_p_mvs(MpegEncContext * s)
 }
 
 /**
- *
  * @param truncate 1 for truncation, 0 for using intra
  */
 void ff_fix_long_mvs(MpegEncContext * s, uint8_t *field_select_table, int field_select,
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 252029cd3a..867449b195 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -151,7 +151,6 @@ void ff_mpeg4_init_direct_mv(MpegEncContext *s);
 int ff_mpeg4_frame_end(AVCodecContext *avctx, const uint8_t *buf, int buf_size);
 
 /**
- *
  * @return the mb_type
  */
 int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my);
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 62f52b153d..d56c56f479 100644
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -24,7 +24,6 @@
  * Microsoft Video-1 Decoder by Mike Melanson (melanson@pcisys.net)
  * For more information about the MS Video-1 format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
- *
  */
 
 #include <stdio.h>
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index fe6a5486aa..c22c96d6f0 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavcodec/pcm_tablegen.h b/libavcodec/pcm_tablegen.h
index 79d6561646..438c2b9ea4 100644
--- a/libavcodec/pcm_tablegen.h
+++ b/libavcodec/pcm_tablegen.h
@@ -36,10 +36,7 @@
 
 #define         BIAS            (0x84)      /* Bias for linear code. */
 
-/*
- * alaw2linear() - Convert an A-law value to 16-bit linear PCM
- *
- */
+/* alaw2linear() - Convert an A-law value to 16-bit linear PCM */
 static av_cold int alaw2linear(unsigned char a_val)
 {
         int t;
diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c
index 892e141528..c03106c8e1 100644
--- a/libavcodec/profiles.c
+++ b/libavcodec/profiles.c
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h
index 4c9e4cdb52..2e6c85965d 100644
--- a/libavcodec/profiles.h
+++ b/libavcodec/profiles.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 4736facfdf..78dff5a1e0 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -794,7 +794,6 @@ static void fill_coding_method_array(sb_int8_array tone_level_idx,
 }
 
 /**
- *
  * Called by process_subpacket_11 to process more data from subpacket 11
  * with sb 0-8.
  * Called by process_subpacket_12 to process data from subpacket 12 with
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c
index 9897f586df..1a5d106b08 100644
--- a/libavcodec/rangecoder.c
+++ b/libavcodec/rangecoder.c
@@ -28,7 +28,6 @@
  *     G. N. N. Martin                  Presented in March 1979 to the Video &
  *                                      Data Recording Conference,
  *     IBM UK Scientific Center         held in Southampton July 24-27 1979."
- *
  */
 
 #include <string.h>
diff --git a/libavcodec/rl.h b/libavcodec/rl.h
index fe4efef972..e4a622f322 100644
--- a/libavcodec/rl.h
+++ b/libavcodec/rl.h
@@ -49,7 +49,6 @@ typedef struct RLTable {
 } RLTable;
 
 /**
- *
  * @param static_store static uint8_t array[2][2*MAX_RUN + MAX_LEVEL + 3] which will hold
  *                     the level and run tables, if this is NULL av_malloc() will be used
  */
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index ce98a83dba..ee6dc70942 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -23,7 +23,6 @@
  * @file
  * Shorten decoder
  * @author Jeff Muizelaar
- *
  */
 
 #include <limits.h>
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index c96a577a81..7c54473228 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -32,7 +32,6 @@
  *  then this coded picture is packed with ZLib
  *
  * Supports: BGR8,BGR555,BGR24 - only BGR8 and BGR555 tested
- *
  */
 
 #include <stdio.h>
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 0631439a1c..ec5d68d4de 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -24,7 +24,6 @@
 /**
  * @file
  * VC-1 and WMV3 decoder common code
- *
  */
 
 #include "libavutil/attributes.h"
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c
index a193dd704d..cbcc8d29da 100644
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@ -22,7 +22,6 @@
 /**
  * @file
  * VC-1 and WMV3 decoder
- *
  */
 
 #include "libavutil/common.h"
diff --git a/libavcodec/vc1dsp.h b/libavcodec/vc1dsp.h
index 682f682144..f2b0c707fd 100644
--- a/libavcodec/vc1dsp.h
+++ b/libavcodec/vc1dsp.h
@@ -22,7 +22,6 @@
 /**
  * @file
  * VC-1 and WMV3 decoder
- *
  */
 
 #ifndef AVCODEC_VC1DSP_H
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 18d2754661..2cdad5af15 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavcodec/vorbis_parser.h b/libavcodec/vorbis_parser.h
index 9ae1630f9f..f97a523fb7 100644
--- a/libavcodec/vorbis_parser.h
+++ b/libavcodec/vorbis_parser.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index e684cb9ff9..4d86c8b357 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index 62f1d87828..413b6634cc 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h
index 0bfe845e63..dcea3da79b 100644
--- a/libavfilter/buffersrc.h
+++ b/libavfilter/buffersrc.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavfilter/formats.h b/libavfilter/formats.h
index 2e44792f3c..b273f8aa03 100644
--- a/libavfilter/formats.h
+++ b/libavfilter/formats.h
@@ -204,7 +204,6 @@ void ff_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref);
 void ff_formats_unref(AVFilterFormats **ref);
 
 /**
- *
  *         Before                                 After
  *   ________                         ________
  *  |formats |<---------.            |formats |<---------.
diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c
index dd3b174b1b..a60c1dcfba 100644
--- a/libavfilter/pthread.c
+++ b/libavfilter/pthread.c
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavfilter/thread.h b/libavfilter/thread.h
index 1cfea3e7ba..42b7cafcf3 100644
--- a/libavfilter/thread.h
+++ b/libavfilter/thread.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4926a354f9..3dfbf6468c 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -251,7 +251,6 @@
  * @{
  * @}
  * @}
- *
  */
 
 #include <time.h>
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index aff5564215..8616499867 100644
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c
index 603368370c..2a802882f9 100644
--- a/libavformat/rtpdec_hevc.c
+++ b/libavformat/rtpdec_hevc.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #include "libavutil/avstring.h"
diff --git a/libavformat/unix.c b/libavformat/unix.c
index 72b8fcdbbb..59de8f8ad0 100644
--- a/libavformat/unix.c
+++ b/libavformat/unix.c
@@ -23,7 +23,6 @@
  * @file
  *
  * Unix socket url_protocol
- *
  */
 
 #include <sys/un.h>
diff --git a/libavformat/url.h b/libavformat/url.h
index ca252aa7c2..4f153ce2aa 100644
--- a/libavformat/url.h
+++ b/libavformat/url.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index bab61f3422..67a4cef5f2 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -46,9 +46,7 @@
 #define LEN_PRETTY_GUID 34
 
 /*
- *
  * File system routines
- *
  */
 
 #define WTV_SECTOR_BITS    12
@@ -319,9 +317,7 @@ static void wtvfile_close(AVIOContext *pb)
 }
 
 /*
- *
  * Main demuxer
- *
  */
 
 typedef struct WtvStream {
diff --git a/libavutil/atomic_suncc.h b/libavutil/atomic_suncc.h
index 5c11b5704a..b78c37767a 100644
--- a/libavutil/atomic_suncc.h
+++ b/libavutil/atomic_suncc.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavutil/dict.h b/libavutil/dict.h
index b3277ab77c..3649b9fbe7 100644
--- a/libavutil/dict.h
+++ b/libavutil/dict.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
@@ -55,7 +54,6 @@
    }
    av_dict_free(&d);
  @endcode
- *
  */
 
 #define AV_DICT_MATCH_CASE      1
diff --git a/libavutil/frame.c b/libavutil/frame.c
index 542215a16b..ae80cee062 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavutil/frame.h b/libavutil/frame.h
index 5398b89ba1..5a04177598 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index f2c6c8d232..d22427adb2 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -24,7 +24,6 @@
 /**
  * @file
  * pixel format definitions
- *
  */
 
 #include "libavutil/avconfig.h"
diff --git a/libavutil/replaygain.h b/libavutil/replaygain.h
index 7871d2c762..15da873770 100644
--- a/libavutil/replaygain.h
+++ b/libavutil/replaygain.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h
index 8347fac29c..a770746ce3 100644
--- a/libavutil/samplefmt.h
+++ b/libavutil/samplefmt.h
@@ -32,7 +32,6 @@
  *
  * Audio sample format enumeration and related convenience functions.
  * @{
- *
  */
 
 /**
diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
index 74b0f18190..a2ace788e5 100644
--- a/libswscale/ppc/yuv2rgb_altivec.c
+++ b/libswscale/ppc/yuv2rgb_altivec.c
@@ -141,7 +141,6 @@ typedef signed char   sbyte;
  *           brgb|rgbr|gbrg|brgb
  *           1001 0010 0100 1001
  *           a67b 89cA BdCD eEFf
- *
  */
 static const vector unsigned char
     perm_rgb_0 = { 0x00, 0x01, 0x10, 0x02, 0x03, 0x11, 0x04, 0x05,