mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-23 11:39:49 +00:00
Merge commit '29c2d06d67724e994980045afa055c6c34611b30'
* commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
commit
1a12eb4a73
@ -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>
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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){
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
|
@ -35,7 +35,6 @@
|
||||
* http://www.pcisys.net/~melanson/codecs
|
||||
*
|
||||
* Supports: BGR24 (RGB 24bpp)
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -35,7 +35,6 @@
|
||||
* http://www.pcisys.net/~melanson/codecs
|
||||
*
|
||||
* Supports: BGR24 (RGB 24bpp)
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
|
@ -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>
|
||||
|
@ -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;
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
*/
|
||||
|
@ -23,7 +23,6 @@
|
||||
* @file
|
||||
* Shorten decoder
|
||||
* @author Jeff Muizelaar
|
||||
*
|
||||
*/
|
||||
|
||||
#include <limits.h>
|
||||
|
@ -32,7 +32,6 @@
|
||||
* then this coded picture is packed with ZLib
|
||||
*
|
||||
* Supports: BGR8,BGR555,BGR24 - only BGR8 and BGR555 tested
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -24,7 +24,6 @@
|
||||
/**
|
||||
* @file
|
||||
* VC-1 and WMV3 decoder common code
|
||||
*
|
||||
*/
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
|
@ -22,7 +22,6 @@
|
||||
/**
|
||||
* @file
|
||||
* VC-1 and WMV3 decoder
|
||||
*
|
||||
*/
|
||||
|
||||
#include "libavutil/avassert.h"
|
||||
|
@ -22,7 +22,6 @@
|
||||
/**
|
||||
* @file
|
||||
* VC-1 and WMV3 decoder
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef AVCODEC_VC1DSP_H
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -273,7 +273,6 @@ int ff_formats_ref(AVFilterFormats *formats, AVFilterFormats **ref);
|
||||
void ff_formats_unref(AVFilterFormats **ref);
|
||||
|
||||
/**
|
||||
*
|
||||
* Before After
|
||||
* ________ ________
|
||||
* |formats |<---------. |formats |<---------.
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -310,7 +310,6 @@
|
||||
* @{
|
||||
* @}
|
||||
* @}
|
||||
*
|
||||
*/
|
||||
|
||||
#include <time.h>
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -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"
|
||||
|
@ -23,7 +23,6 @@
|
||||
* @file
|
||||
*
|
||||
* Unix socket url_protocol
|
||||
*
|
||||
*/
|
||||
|
||||
#include "libavutil/avstring.h"
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -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 {
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -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(). */
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -24,7 +24,6 @@
|
||||
/**
|
||||
* @file
|
||||
* pixel format definitions
|
||||
*
|
||||
*/
|
||||
|
||||
#include "libavutil/avconfig.h"
|
||||
|
@ -1,5 +1,4 @@
|
||||
/*
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
|
@ -32,7 +32,6 @@
|
||||
*
|
||||
* Audio sample format enumeration and related convenience functions.
|
||||
* @{
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user