diff options
51 files changed, 79 insertions, 86 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 66cf6d5f40..6c6e573e90 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -160,7 +160,7 @@ typedef struct AacPsyContext{ /** * LAME psy model preset struct */ -typedef struct { +typedef struct PsyLamePreset { int quality; ///< Quality to map the rest of the vaules to. /* This is overloaded to be both kbps per channel in ABR mode, and * requested quality in constant quality mode. diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 4876ac055d..a0359faa2d 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -452,7 +452,7 @@ static void calc_transform_coeffs_cpl(AC3DecodeContext *s) /** * Grouped mantissas for 3-level 5-level and 11-level quantization */ -typedef struct { +typedef struct mant_groups { int b1_mant[2]; int b2_mant[2]; int b4_mant; diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 5272f8416c..48903a671b 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -58,7 +58,7 @@ #define ALAC_EXTRADATA_SIZE 36 -typedef struct { +typedef struct ALACContext { AVCodecContext *avctx; GetBitContext gb; int channels; diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index b1965a8b87..4bb35cc656 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -152,7 +152,7 @@ enum RA_Flag { }; -typedef struct { +typedef struct ALSSpecificConfig { uint32_t samples; ///< number of samples, 0xFFFFFFFF if unknown int resolution; ///< 000 = 8-bit; 001 = 16-bit; 010 = 24-bit; 011 = 32-bit int floating; ///< 1 = IEEE 32-bit floating-point, 0 = integer @@ -178,7 +178,7 @@ typedef struct { } ALSSpecificConfig; -typedef struct { +typedef struct ALSChannelData { int stop_flag; int master_channel; int time_diff_flag; @@ -188,7 +188,7 @@ typedef struct { } ALSChannelData; -typedef struct { +typedef struct ALSDecContext { AVCodecContext *avctx; ALSSpecificConfig sconf; GetBitContext gb; @@ -227,7 +227,7 @@ typedef struct { } ALSDecContext; -typedef struct { +typedef struct ALSBlockData { unsigned int block_length; ///< number of samples within the block unsigned int ra_block; ///< if true, this is a random access block int *const_block; ///< if true, this is a constant value block diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 668c84d1f3..5ef22d3d4d 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -42,7 +42,7 @@ #include "amrwbdata.h" -typedef struct { +typedef struct AMRWBContext { AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream enum Mode fr_cur_mode; ///< mode index of current frame uint8_t fr_quality; ///< frame quality index (FQI) diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 556bfe4461..346a9ca413 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -49,7 +49,7 @@ static const uint8_t ansi_to_cga[16] = { 0, 4, 2, 6, 1, 5, 3, 7, 8, 12, 10, 14, 9, 13, 11, 15 }; -typedef struct { +typedef struct AnsiContext { AVFrame *frame; int x; /**< x cursor position (pixels) */ int y; /**< y cursor position (pixels) */ diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index 9a897852a7..5c8f96a31c 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -57,7 +57,7 @@ /** * Sound unit struct, one unit is used per channel */ -typedef struct { +typedef struct AT1SUCtx { int log2_block_count[AT1_QMF_BANDS]; ///< log2 number of blocks in a band int num_bfus; ///< number of Block Floating Units float* spectrum[2]; @@ -71,7 +71,7 @@ typedef struct { /** * The atrac1 context, holds all needed parameters for decoding */ -typedef struct { +typedef struct AT1Ctx { AT1SUCtx SUs[AT1_MAX_CHANNELS]; ///< channel sound unit DECLARE_ALIGNED(32, float, spec)[AT1_SU_SAMPLES]; ///< the mdct spectrum buffer diff --git a/libavcodec/avs.c b/libavcodec/avs.c index eb2da66928..85d18fd41a 100644 --- a/libavcodec/avs.c +++ b/libavcodec/avs.c @@ -23,8 +23,7 @@ #include "get_bits.h" #include "internal.h" - -typedef struct { +typedef struct AvsContext { AVFrame *frame; } AvsContext; diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index eb9cd0ab62..ffc8f87b13 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -44,7 +44,7 @@ static float quant_table[96]; #define MAX_CHANNELS 2 #define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11) -typedef struct { +typedef struct BinkAudioContext { GetBitContext gb; int version_b; ///< Bink version 'b' int first; diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 8e9f657b7f..f36997ea40 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -129,7 +129,7 @@ static av_always_inline uint32_t bitswap_32(uint32_t x) (uint32_t)ff_reverse[ x >> 24]; } -typedef struct { +typedef struct VLCcode { uint8_t bits; uint16_t symbol; /** codeword, with the first bit-to-be-read in the msb diff --git a/libavcodec/c93.c b/libavcodec/c93.c index c7cc68296a..2729ee8fcb 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -23,7 +23,7 @@ #include "bytestream.h" #include "internal.h" -typedef struct { +typedef struct C93DecoderContext { AVFrame *pictures[2]; int currentpic; } C93DecoderContext; diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c index 80a367163d..e45e722be5 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -31,7 +31,7 @@ #define BIT_LINE 0x80 #define BYTE_LINE 0xC0 -typedef struct { +typedef struct CDXLVideoContext { AVCodecContext *avctx; int bpp; int format; diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index caf14cbfcf..3a740b22c1 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -40,14 +40,14 @@ #include "internal.h" -typedef struct { +typedef struct cvid_codebook { uint8_t y0, y1, y2, y3; uint8_t u, v; } cvid_codebook; #define MAX_STRIPS 32 -typedef struct { +typedef struct cvid_strip { uint16_t id; uint16_t x1, y1; uint16_t x2, y2; diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 8c2fab7a27..5c55d2b591 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -64,12 +64,12 @@ #define SUBBAND_SIZE 20 #define MAX_SUBPACKETS 5 -typedef struct { +typedef struct cook_gains { int *now; int *previous; } cook_gains; -typedef struct { +typedef struct COOKSubpacket { int ch_idx; int size; int num_channels; diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 9ae7e33c7a..358240b7a9 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -30,7 +30,7 @@ #endif #include "libavutil/lzo.h" -typedef struct { +typedef struct CamStudioContext { int linelen, height, bpp; unsigned int decomp_size; unsigned char* decomp_buf; diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 8ca8c34510..bb7e020bb2 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -266,7 +266,7 @@ static const int8_t dca_channel_reorder_nolfe_xch[][9] = { #define DCA_NSYNCAUX 0x9A1105A0 /** Bit allocation */ -typedef struct { +typedef struct BitAlloc { int offset; ///< code values offset int maxbits[8]; ///< max bits in VLC int wrap; ///< wrap for get_vlc2() @@ -285,7 +285,7 @@ static av_always_inline int get_bitalloc(GetBitContext *gb, BitAlloc *ba, ba->offset; } -typedef struct { +typedef struct DCAContext { AVClass *class; ///< class for AVOptions AVCodecContext *avctx; /* Frame header */ diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index 4357e45eb6..e2b03a6f9b 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -43,7 +43,7 @@ typedef struct cell_s { /** * ELBG internal data */ -typedef struct{ +typedef struct elbg_data { int error; int dim; int numCB; diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index bbdb404a99..f3879bdbcd 100644 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -55,7 +55,7 @@ enum Rate { /** * G723.1 unpacked data subframe */ -typedef struct { +typedef struct G723_1_Subframe { int ad_cb_lag; ///< adaptive codebook lag int ad_cb_gain; int dirac_train; @@ -68,7 +68,7 @@ typedef struct { /** * Pitch postfilter parameters */ -typedef struct { +typedef struct PPFParam { int index; ///< postfilter backward/forward lag int16_t opt_gain; ///< optimal gain int16_t sc_gain; ///< scaling gain diff --git a/libavcodec/gif.c b/libavcodec/gif.c index c6c37b6c66..ae7fdfd818 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -52,7 +52,7 @@ #include "put_bits.h" -typedef struct { +typedef struct GIFContext { LZWState *lzw; uint8_t *buf; } GIFContext; diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index dec2197fc9..eb5f01fcf9 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -33,7 +33,7 @@ /* symbol for Huffman tree node */ #define HNODE -1 -typedef struct { +typedef struct HeapElem { uint64_t val; int name; } HeapElem; diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index 70c98d68e0..87a1013966 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -56,8 +56,7 @@ #define HUF_TOKENS 256 #define PALETTE_COUNT 256 -typedef struct -{ +typedef struct hnode { int count; unsigned char used; int children[2]; diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 112c2ca93c..92c3764462 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -33,7 +33,7 @@ #include "get_bits.h" #include "internal.h" -typedef struct { +typedef struct IffContext { AVFrame *frame; int planesize; uint8_t * planebuf; diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 500f56408d..cb95d39ca1 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -79,7 +79,7 @@ typedef struct IMCChannel { int decoder_reset; } IMCChannel; -typedef struct { +typedef struct IMCContext { IMCChannel chctx[2]; /** MDCT tables */ diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index d58e775996..4035e472f3 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -30,7 +30,7 @@ #include "avcodec.h" #include "internal.h" -typedef struct { +typedef struct KgvContext { AVCodecContext *avctx; uint16_t *frame_buffer; uint16_t *last_frame_buffer; diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index c7697a5e87..73b1b9f71e 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -74,7 +74,7 @@ static const enum AVPixelFormat any_pix_fmts[] = { RGB_PIXEL_FORMATS, GRAY_PIXEL_FORMATS, YUV_PIXEL_FORMATS, XYZ_PIXEL_FORMATS }; -typedef struct { +typedef struct LibOpenJPEGContext { AVClass *class; opj_dparameters_t dec_params; int lowres; diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 2c2109f076..00c0ed6d0d 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -34,7 +34,7 @@ #include "avcodec.h" #include "internal.h" -typedef struct { +typedef struct LibOpenJPEGContext { AVClass *avclass; opj_image_t *image; opj_cparameters_t enc_params; diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c index d00696ee39..a26b763688 100644 --- a/libavcodec/libspeexdec.c +++ b/libavcodec/libspeexdec.c @@ -28,7 +28,7 @@ #include "avcodec.h" #include "internal.h" -typedef struct { +typedef struct LibSpeexContext { SpeexBits bits; SpeexStereoState stereo; void *dec_state; diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index 98f89b214f..ec8882f936 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -92,7 +92,7 @@ #include "internal.h" #include "audio_frame_queue.h" -typedef struct { +typedef struct LibSpeexEncContext { AVClass *class; ///< AVClass for private options SpeexBits bits; ///< libspeex bitwriter context SpeexHeader header; ///< libspeex header struct diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 88ee5d380c..7f97366de4 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -35,7 +35,7 @@ #define MIMIC_HEADER_SIZE 20 -typedef struct { +typedef struct MimicContext { AVCodecContext *avctx; int num_vblocks[3]; diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index c31ff11222..b3acde4f9d 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -32,7 +32,7 @@ #include "internal.h" #include "rtjpeg.h" -typedef struct { +typedef struct NuvContext { AVFrame *pic; int codec_frameheader; int quality; diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c index 03f63d9dce..1bbe267ec3 100644 --- a/libavcodec/proresdec.c +++ b/libavcodec/proresdec.c @@ -40,7 +40,7 @@ #include "proresdsp.h" #include "get_bits.h" -typedef struct { +typedef struct ProresThreadData { const uint8_t *index; ///< pointers to the data of this slice int slice_num; int x_pos, y_pos; @@ -51,7 +51,7 @@ typedef struct { DECLARE_ALIGNED(16, int16_t, qmat_chroma_scaled)[64]; } ProresThreadData; -typedef struct { +typedef struct ProresContext { ProresDSPContext dsp; AVFrame *frame; ScanTable scantable; diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index 7d9427c008..d4a82ee901 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -52,7 +52,7 @@ typedef enum { RATE_FULL } qcelp_packet_rate; -typedef struct { +typedef struct QCELPContext { GetBitContext gb; qcelp_packet_rate bitrate; QCELPFrame frame; /**< unpacked data frame */ diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 4718b34942..188358a04f 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -83,7 +83,7 @@ typedef int8_t sb_int8_array[2][30][64]; /** * Subpacket */ -typedef struct { +typedef struct QDM2SubPacket { int type; ///< subpacket type unsigned int size; ///< subpacket size const uint8_t *data; ///< pointer to subpacket data (points to input data buffer, it's not a private copy) @@ -97,12 +97,12 @@ typedef struct QDM2SubPNode { struct QDM2SubPNode *next; ///< pointer to next packet in the list, NULL if leaf node } QDM2SubPNode; -typedef struct { +typedef struct QDM2Complex { float re; float im; } QDM2Complex; -typedef struct { +typedef struct FFTTone { float level; QDM2Complex *complex; const float *table; @@ -113,7 +113,7 @@ typedef struct { short cutoff; } FFTTone; -typedef struct { +typedef struct FFTCoefficient { int16_t sub_packet; uint8_t channel; int16_t offset; @@ -121,14 +121,14 @@ typedef struct { uint8_t phase; } FFTCoefficient; -typedef struct { +typedef struct QDM2FFT { DECLARE_ALIGNED(32, QDM2Complex, complex)[MPA_MAX_CHANNELS][256]; } QDM2FFT; /** * QDM2 decoder context */ -typedef struct { +typedef struct QDM2Context { /// Parameters from codec header, do not change during playback int nb_channels; ///< number of channels int channels; ///< number of channels diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index 215786c803..a67c6571fd 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -37,7 +37,7 @@ #define RA288_BLOCK_SIZE 5 #define RA288_BLOCKS_PER_FRAME 32 -typedef struct { +typedef struct RA288Context { AVFloatDSPContext fdsp; DECLARE_ALIGNED(32, float, sp_lpc)[FFALIGN(36, 16)]; ///< LPC coefficients for speech data (spec: A) DECLARE_ALIGNED(32, float, gain_lpc)[FFALIGN(10, 16)]; ///< LPC coefficients for gain (spec: GB) diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c index 402eb78be5..936b809e39 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -32,8 +32,7 @@ #define MAX_DPCM (127*127) -typedef struct -{ +typedef struct ROQDPCMContext { short lastSample[2]; int input_frames; int buffered_samples; diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index fb7635a5ae..fd651e9552 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -183,8 +183,7 @@ static inline int squared_diff_macroblock(uint8_t a[], uint8_t b[], int size) return sdiff; } -typedef struct -{ +typedef struct SubcelEvaluation { int eval_dist[4]; int best_bit_use; int best_coding; @@ -194,8 +193,7 @@ typedef struct int cbEntry; } SubcelEvaluation; -typedef struct -{ +typedef struct CelEvaluation { int eval_dist[4]; int best_coding; @@ -207,8 +205,7 @@ typedef struct int sourceX, sourceY; } CelEvaluation; -typedef struct -{ +typedef struct RoqCodebooks { int numCB4; int numCB2; int usedCB2[MAX_CBS_2x2]; @@ -602,8 +599,7 @@ static inline uint8_t motion_arg(motion_vect mot) return ((ax&15)<<4) | (ay&15); } -typedef struct -{ +typedef struct CodingSpool { int typeSpool; int typeSpoolLength; uint8_t argumentSpool[64]; diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c index 8af74431c0..ec6d3a5644 100644 --- a/libavcodec/rv34_parser.c +++ b/libavcodec/rv34_parser.c @@ -27,7 +27,7 @@ #include "parser.h" #include "libavutil/intreadwrite.h" -typedef struct { +typedef struct RV34ParseContext { ParseContext pc; int64_t key_dts; int key_pts; diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index 98607f2287..81c38a3a99 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -44,7 +44,7 @@ #include "sipr.h" #include "siprdata.h" -typedef struct { +typedef struct SiprModeParam { const char *mode_name; uint16_t bits_per_frame; uint8_t subframe_count; diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c index bbc80617ac..3bee3c726f 100644 --- a/libavcodec/srtdec.c +++ b/libavcodec/srtdec.c @@ -41,7 +41,7 @@ enum { PARAM_NUMBER }; -typedef struct { +typedef struct SrtStack { char tag[128]; char param[PARAM_NUMBER][128]; } SrtStack; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index fc2120b2cb..88c060d307 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -68,7 +68,7 @@ * svq3 decoder. */ -typedef struct { +typedef struct SVQ3Context { H264Context h; HpelDSPContext hdsp; TpelDSPContext tdsp; diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index 34b7c3b5a7..9cf9c92efe 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -35,7 +35,7 @@ /** * TrueSpeech decoder context */ -typedef struct { +typedef struct TSContext { BswapDSPContext bdsp; /* input data */ DECLARE_ALIGNED(16, uint8_t, buffer)[32]; diff --git a/libavcodec/v210enc.h b/libavcodec/v210enc.h index f950328d30..908506db6e 100644 --- a/libavcodec/v210enc.h +++ b/libavcodec/v210enc.h @@ -23,7 +23,7 @@ #include "libavutil/opt.h" #include "libavutil/pixfmt.h" -typedef struct { +typedef struct V210EncContext { void (*pack_line_8)(const uint8_t *y, const uint8_t *u, const uint8_t *v, uint8_t *dst, ptrdiff_t width); void (*pack_line_10)(const uint16_t *y, const uint16_t *u, diff --git a/libavcodec/vble.c b/libavcodec/vble.c index 4d5cd96295..8e042c25d1 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -32,7 +32,7 @@ #include "internal.h" #include "mathops.h" -typedef struct { +typedef struct VBLEContext { AVCodecContext *avctx; HuffYUVDSPContext hdsp; diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 7d8d016be9..38b62f72bd 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -47,7 +47,7 @@ typedef enum { ONE } VC1ParseSearchState; -typedef struct { +typedef struct VC1ParseContext { ParseContext pc; VC1Context v; uint8_t prev_start_code; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index ed8253a0f5..22cf1e502d 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -38,7 +38,7 @@ #if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER -typedef struct { +typedef struct SpriteData { /** * Transform coefficients for both sprites in 16.16 fixed point format, * in the order they appear in the bitstream: diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index d7fec98c6e..dbcc1cd911 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -42,7 +42,7 @@ #define V_MAX_VLCS (1 << 16) #define V_MAX_PARTITIONS (1 << 20) -typedef struct { +typedef struct vorbis_codebook { uint8_t dimensions; uint8_t lookup_type; uint8_t maxdepth; @@ -58,7 +58,7 @@ struct vorbis_context_s; typedef int (* vorbis_floor_decode_func) (struct vorbis_context_s *, vorbis_floor_data *, float *); -typedef struct { +typedef struct vorbis_floor { uint8_t floor_type; vorbis_floor_decode_func decode; union vorbis_floor_u { @@ -88,7 +88,7 @@ typedef struct { } data; } vorbis_floor; -typedef struct { +typedef struct vorbis_residue { uint16_t type; uint32_t begin; uint32_t end; @@ -101,7 +101,7 @@ typedef struct { uint8_t *classifs; } vorbis_residue; -typedef struct { +typedef struct vorbis_mapping { uint8_t submaps; uint16_t coupling_steps; uint8_t *magnitude; @@ -111,7 +111,7 @@ typedef struct { uint8_t submap_residue[16]; } vorbis_mapping; -typedef struct { +typedef struct vorbis_mode { uint8_t blockflag; uint16_t windowtype; uint16_t transformtype; diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 10c7932322..12a97bc058 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -39,7 +39,7 @@ #undef NDEBUG #include <assert.h> -typedef struct { +typedef struct vorbis_enc_codebook { int nentries; uint8_t *lens; uint32_t *codewords; @@ -53,14 +53,14 @@ typedef struct { float *pow2; } vorbis_enc_codebook; -typedef struct { +typedef struct vorbis_enc_floor_class { int dim; int subclass; int masterbook; int *books; } vorbis_enc_floor_class; -typedef struct { +typedef struct vorbis_enc_floor { int partitions; int *partition_to_class; int nclasses; @@ -71,7 +71,7 @@ typedef struct { vorbis_floor1_entry *list; } vorbis_enc_floor; -typedef struct { +typedef struct vorbis_enc_residue { int type; int begin; int end; @@ -82,7 +82,7 @@ typedef struct { float (*maxes)[2]; } vorbis_enc_residue; -typedef struct { +typedef struct vorbis_enc_mapping { int submaps; int *mux; int *floor; @@ -92,12 +92,12 @@ typedef struct { int *angle; } vorbis_enc_mapping; -typedef struct { +typedef struct vorbis_enc_mode { int blockflag; int mapping; } vorbis_enc_mode; -typedef struct { +typedef struct vorbis_enc_context { int channels; int sample_rate; int log2_blocksize[2]; diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index b8a1776e59..eea7f94353 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -50,7 +50,7 @@ /** * @brief frame-specific decoder context for a single channel */ -typedef struct { +typedef struct WmallChannelCtx { int16_t prev_block_len; ///< length of the previous block uint8_t transmit_coefs; uint8_t num_subframes; diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index afe6ac2c95..5e063764c6 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -132,7 +132,7 @@ static float sin64[33]; ///< sine table for decorrelation /** * @brief frame specific decoder context for a single channel */ -typedef struct { +typedef struct WMAProChannelCtx { int16_t prev_block_len; ///< length of the previous block uint8_t transmit_coefs; uint8_t num_subframes; @@ -157,7 +157,7 @@ typedef struct { /** * @brief channel group for channel transformations */ -typedef struct { +typedef struct WMAProChannelGrp { uint8_t num_channels; ///< number of channels in the group int8_t transform; ///< transform on / off int8_t transform_band[MAX_BANDS]; ///< controls if the transform is enabled for a certain band diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 0d91077eca..e408166c48 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -131,7 +131,7 @@ static const struct frame_type_desc { /** * WMA Voice decoding context. */ -typedef struct { +typedef struct WMAVoiceContext { /** * @name Global values specified in the stream header / extradata or used all over. * @{ diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index eeba2dedf7..89c869cc5f 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -22,7 +22,7 @@ #include "internal.h" #include "libavutil/common.h" -typedef struct { +typedef struct ZeroCodecContext { AVFrame *previous_frame; z_stream zstream; } ZeroCodecContext; |