Merge commit '29c2d06d67724e994980045afa055c6c34611b30'

* commit '29c2d06d67724e994980045afa055c6c34611b30':
  cosmetics: Drop empty comment lines

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

29 files changed, 1 insertions, 37 deletions

diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 2e4464d..46344e0 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 alpha)
- *
  */
 
 #include <stdio.h>
diff --git a/libavcodec/acelp_filters.h b/libavcodec/acelp_filters.h
index 7a3061b..fe86cb2 100644
--- a/libavcodec/acelp_filters.h
+++ b/libavcodec/acelp_filters.h
@@ -82,7 +82,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 a99dbd1..7d0c135 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -151,7 +151,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)
 {
@@ -178,7 +177,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)
 {
@@ -212,7 +210,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 94d12ba..f4fe056 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -70,7 +70,6 @@
  * @{
  * @}
  * @}
- *
  */
 
 /**
@@ -2184,7 +2183,6 @@ typedef struct AVCodecContext {
 #endif
 
     /**
-     *
      * - encoding: Set by user.
      * - decoding: unused
      */
@@ -2226,7 +2224,6 @@ typedef struct AVCodecContext {
 #endif
 
     /**
-     *
      * Note: Value depends upon the compare function used for fullpel ME.
      * - encoding: Set by user.
      * - decoding: unused
@@ -4187,7 +4184,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);
 
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index a9fafbd..1a877dd 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -159,7 +159,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_encoder(CABACContext *c, uint8_t *buf, int buf_size){
diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h
index cbb186b..fe72a82 100644
--- a/libavcodec/cabac_functions.h
+++ b/libavcodec/cabac_functions.h
@@ -172,7 +172,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
  */
 #ifndef get_cabac_terminate
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c
index 10a25d8..10e118e 100644
--- a/libavcodec/cavs.c
+++ b/libavcodec/cavs.c
@@ -105,7 +105,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 1f52f20..38a57b7 100644
--- a/libavcodec/error_resilience.h
+++ b/libavcodec/error_resilience.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index d46d940..35e254e 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -467,7 +467,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 2131338..9a5bc3f 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -2045,7 +2045,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 f7eff63..085ec09 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 c04ed5e..5507910 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 1b1e08b..58ad141 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 5236938..77a07a5 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -1714,7 +1714,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 5998c71..5d896fa 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -158,7 +158,6 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx);
 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 891675f..b6c45a0 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/pcm_tablegen.h b/libavcodec/pcm_tablegen.h
index 7269977..7ce147f 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 94069fd..da745e1 100644
--- a/libavcodec/profiles.c
+++ b/libavcodec/profiles.c
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h
index 7e1f74d..d43e680 100644
--- a/libavcodec/profiles.h
+++ b/libavcodec/profiles.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 0b6dcd6..52881cc 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -635,7 +635,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 200217a..b81a6d0 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 33f4ef8..af525ef 100644
--- a/libavcodec/rl.h
+++ b/libavcodec/rl.h
@@ -48,7 +48,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 0f5be96..b27707a 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 8c5ec68..bd5fe03 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 08e1f2c..bb56967 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 a16c8d5..2d7e9b7 100644
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@ -22,7 +22,6 @@
 /**
  * @file
  * VC-1 and WMV3 decoder
- *
  */
 
 #include "libavutil/avassert.h"
diff --git a/libavcodec/vc1dsp.h b/libavcodec/vc1dsp.h
index e2f75ac..3d48f09 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 52b8f2a..abb8c47 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
diff --git a/libavcodec/vorbis_parser.h b/libavcodec/vorbis_parser.h
index 81fda3b..9205027 100644
--- a/libavcodec/vorbis_parser.h
+++ b/libavcodec/vorbis_parser.h
@@ -1,5 +1,4 @@
 /*
- *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or