Merge commit '29c2d06d67724e994980045afa055c6c34611b30'

* commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years ago · 1a12eb4a73
--- 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>
--- 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,
--- 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)
 {
--- 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);

--- 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){
--- 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
--- 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)
 {
--- 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
--- 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)
--- 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)
--- 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.
 *
 */


--- 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>
--- 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>
--- 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,
--- 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);
--- 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>
--- 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;
--- 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
--- 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
--- 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
--- 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>
--- 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
 */
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -23,7 +23,6 @@
 * @file
 * Shorten decoder
 * @author Jeff Muizelaar
 *
 */

 #include <limits.h>
--- 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>
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -24,7 +24,6 @@
 /**
 * @file
 * VC-1 and WMV3 decoder common code
 *
 */

 #include "libavutil/attributes.h"
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@ -22,7 +22,6 @@
 /**
 * @file
 * VC-1 and WMV3 decoder
 *
 */

 #include "libavutil/avassert.h"
--- a/libavcodec/vc1dsp.h
+++ b/libavcodec/vc1dsp.h
@@ -22,7 +22,6 @@
 /**
 * @file
 * VC-1 and WMV3 decoder
 *
 */

 #ifndef AVCODEC_VC1DSP_H
--- 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
--- 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
--- a/libavfilter/buffersrc.h
+++ b/libavfilter/buffersrc.h
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
--- a/libavfilter/formats.h
+++ b/libavfilter/formats.h
@@ -273,7 +273,6 @@ int ff_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref);
 void ff_formats_unref(AVFilterFormats **ref);

 /**
 *
 *         Before                                 After
 *   ________                         ________
 *  |formats |<---------.            |formats |<---------.
--- a/libavfilter/pthread.c
+++ b/libavfilter/pthread.c
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
--- a/libavfilter/thread.h
+++ b/libavfilter/thread.h
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -310,7 +310,6 @@
 * @{
 * @}
 * @}
 *
 */

 #include <time.h>
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
--- 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 FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 */

 #include "libavutil/avassert.h"
--- a/libavformat/unix.c
+++ b/libavformat/unix.c
@@ -23,7 +23,6 @@
 * @file
 *
 * Unix socket url_protocol
 *
 */

 #include "libavutil/avstring.h"
--- a/libavformat/url.h
+++ b/libavformat/url.h
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -44,9 +44,7 @@
 #define LEN_PRETTY_GUID 34

 /*
 *
 * File system routines
 *
 */

 typedef struct WtvFile {
@@ -311,9 +309,7 @@ static void wtvfile_close(AVIOContext *pb)
 }

 /*
 *
 * Main demuxer
 *
 */

 typedef struct WtvStream {
--- a/libavutil/atomic_suncc.h
+++ b/libavutil/atomic_suncc.h
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
--- a/libavutil/dict.h
+++ b/libavutil/dict.h
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
@@ -65,7 +64,6 @@
   }
   av_dict_free(&d);
 @endcode
 *
 */

 #define AV_DICT_MATCH_CASE      1   /**< Only get an entry with exact-case key match. Only relevant in av_dict_get(). */
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -24,7 +24,6 @@
 /**
 * @file
 * pixel format definitions
 *
 */

 #include "libavutil/avconfig.h"
--- a/libavutil/replaygain.h
+++ b/libavutil/replaygain.h
@@ -1,5 +1,4 @@
 /*
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or
--- a/libavutil/samplefmt.h
+++ b/libavutil/samplefmt.h
@@ -32,7 +32,6 @@
 *
 * Audio sample format enumeration and related convenience functions.
 * @{
 *
 */

 /**
--- a/libswscale/ppc/yuv2rgb_altivec.c
+++ b/libswscale/ppc/yuv2rgb_altivec.c
@@ -142,7 +142,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,