From e4cbf7529ba4bcfff47c44b0d026ecb356004c8c Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 27 Sep 2012 10:19:53 +0200 Subject: Give all anonymously typedeffed structs in headers a name Anonymous structs cannot be forward declared and have no benefit. --- cmdutils.h | 4 ++-- libavcodec/aac.h | 22 +++++++++++----------- libavcodec/aacadtsdec.h | 2 +- libavcodec/aacps.h | 2 +- libavcodec/ac3.h | 2 +- libavcodec/ac3dec.h | 2 +- libavcodec/acelp_vectors.h | 2 +- libavcodec/adx.h | 4 ++-- libavcodec/amrnbdata.h | 4 ++-- libavcodec/amrwbdata.h | 4 ++-- libavcodec/bytestream.h | 4 ++-- libavcodec/cavs.h | 2 +- libavcodec/dirac.h | 2 +- libavcodec/dnxhddata.h | 2 +- libavcodec/dnxhdenc.h | 4 ++-- libavcodec/dwt.h | 2 +- libavcodec/g722.h | 2 +- libavcodec/gsmdec_data.h | 2 +- libavcodec/huffman.h | 2 +- libavcodec/indeo3data.h | 2 +- libavcodec/intrax8.h | 2 +- libavcodec/ivi_common.h | 16 ++++++++-------- libavcodec/libschroedinger.h | 2 +- libavcodec/mlp.h | 4 ++-- libavcodec/mpc.h | 4 ++-- libavcodec/mpeg4audio.h | 2 +- libavcodec/proresdsp.h | 2 +- libavcodec/qcelpdata.h | 4 ++-- libavcodec/ra144.h | 2 +- libavcodec/roqvideo.h | 6 +++--- libavcodec/rtjpeg.h | 2 +- libavcodec/sbr.h | 6 +++--- libavcodec/vorbis.h | 2 +- libavcodec/vp56.h | 10 +++++----- libavcodec/vp56data.h | 2 +- libavcodec/vp8.h | 8 ++++---- libavcodec/w32pthreads.h | 6 +++--- libavcodec/x86/dsputil_mmx.h | 2 +- libavdevice/alsa-audio.h | 2 +- libavdevice/sndio_common.h | 2 +- libavfilter/gradfun.h | 2 +- libavfilter/yadif.h | 2 +- libavformat/asf.h | 6 +++--- libavformat/audiointerleave.h | 2 +- libavformat/httpauth.h | 4 ++-- libavformat/isom.h | 14 +++++++------- libavformat/mms.h | 4 ++-- libavformat/movenc.h | 4 ++-- libavformat/mpegts.h | 4 ++-- libavformat/mxf.h | 4 ++-- libavformat/nut.h | 12 ++++++------ libavformat/rtpdec.h | 2 +- libavformat/swf.h | 2 +- libavutil/dict.h | 2 +- libavutil/lfg.h | 2 +- libswscale/swscale.h | 4 ++-- 56 files changed, 114 insertions(+), 114 deletions(-) diff --git a/cmdutils.h b/cmdutils.h index 7dc9e8f14f..3cf34ffae3 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -121,7 +121,7 @@ typedef struct SpecifierOpt { } u; } SpecifierOpt; -typedef struct { +typedef struct OptionDef { const char *name; int flags; #define HAS_ARG 0x0001 @@ -356,7 +356,7 @@ int read_yesno(void); */ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size); -typedef struct { +typedef struct PtsCorrectionContext { int64_t num_faulty_pts; /// Number of incorrect PTS values so far int64_t num_faulty_dts; /// Number of incorrect DTS values so far int64_t last_pts; /// PTS of the last frame diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 45aacd1071..32baf9d0c5 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -113,7 +113,7 @@ enum OCStatus { OC_LOCKED, ///< Output configuration locked in place }; -typedef struct { +typedef struct OutputConfiguration { MPEG4AudioConfig m4ac; uint8_t layout_map[MAX_ELEM_ID*4][3]; int layout_map_tags; @@ -125,7 +125,7 @@ typedef struct { /** * Predictor State */ -typedef struct { +typedef struct PredictorState { float cor0; float cor1; float var0; @@ -146,7 +146,7 @@ typedef struct { /** * Long Term Prediction */ -typedef struct { +typedef struct LongTermPrediction { int8_t present; int16_t lag; float coef; @@ -156,7 +156,7 @@ typedef struct { /** * Individual Channel Stream */ -typedef struct { +typedef struct IndividualChannelStream { uint8_t max_sfb; ///< number of scalefactor bands per group enum WindowSequence window_sequence[2]; uint8_t use_kb_window[2]; ///< If set, use Kaiser-Bessel window, otherwise use a sinus window. @@ -177,7 +177,7 @@ typedef struct { /** * Temporal Noise Shaping */ -typedef struct { +typedef struct TemporalNoiseShaping { int present; int n_filt[8]; int length[8][4]; @@ -189,7 +189,7 @@ typedef struct { /** * Dynamic Range Control - decoded from the bitstream but not processed further. */ -typedef struct { +typedef struct DynamicRangeControl { int pce_instance_tag; ///< Indicates with which program the DRC info is associated. int dyn_rng_sgn[17]; ///< DRC sign information; 0 - positive, 1 - negative int dyn_rng_ctl[17]; ///< DRC magnitude information @@ -202,7 +202,7 @@ typedef struct { */ } DynamicRangeControl; -typedef struct { +typedef struct Pulse { int num_pulse; int start; int pos[4]; @@ -212,7 +212,7 @@ typedef struct { /** * coupling parameters */ -typedef struct { +typedef struct ChannelCoupling { enum CouplingPoint coupling_point; ///< The point during decoding at which coupling is applied. int num_coupled; ///< number of target elements enum RawDataBlockType type[8]; ///< Type of channel element to be coupled - SCE or CPE. @@ -226,7 +226,7 @@ typedef struct { /** * Single Channel Element - used for both SCE and LFE elements. */ -typedef struct { +typedef struct SingleChannelElement { IndividualChannelStream ics; TemporalNoiseShaping tns; Pulse pulse; @@ -245,7 +245,7 @@ typedef struct { /** * channel element - generic struct for SCE/CPE/CCE/LFE */ -typedef struct { +typedef struct ChannelElement { // CPE specific int common_window; ///< Set if channels share a common 'IndividualChannelStream' in bitstream. int ms_mode; ///< Signals mid/side stereo flags coding mode (used by encoder) @@ -260,7 +260,7 @@ typedef struct { /** * main AAC context */ -typedef struct { +typedef struct AACContext { AVCodecContext *avctx; AVFrame frame; diff --git a/libavcodec/aacadtsdec.h b/libavcodec/aacadtsdec.h index 60fdd221a2..6319efcea3 100644 --- a/libavcodec/aacadtsdec.h +++ b/libavcodec/aacadtsdec.h @@ -28,7 +28,7 @@ #define AAC_ADTS_HEADER_SIZE 7 -typedef struct { +typedef struct AACADTSHeaderInfo { uint32_t sample_rate; uint32_t samples; uint32_t bit_rate; diff --git a/libavcodec/aacps.h b/libavcodec/aacps.h index 6cdac249f9..e8a195ab2b 100644 --- a/libavcodec/aacps.h +++ b/libavcodec/aacps.h @@ -38,7 +38,7 @@ #define PS_AP_LINKS 3 #define PS_MAX_AP_DELAY 5 -typedef struct { +typedef struct PSContext { int start; int enable_iid; int iid_quant; diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index 304c86c181..647432f02e 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -91,7 +91,7 @@ typedef struct AC3BitAllocParameters { * @struct AC3HeaderInfo * Coded AC-3 header values up to the lfeon element, plus derived values. */ -typedef struct { +typedef struct AC3HeaderInfo { /** @name Coded elements * @{ */ diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index a2625a6023..eabfd29e76 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -65,7 +65,7 @@ /** Large enough for maximum possible frame size when the specification limit is ignored */ #define AC3_FRAME_BUFFER_SIZE 32768 -typedef struct { +typedef struct AC3DecodeContext { AVClass *class; ///< class for AVOptions AVCodecContext *avctx; ///< parent context AVFrame frame; ///< AVFrame for decoded output diff --git a/libavcodec/acelp_vectors.h b/libavcodec/acelp_vectors.h index 2c5d319e45..d6226bf020 100644 --- a/libavcodec/acelp_vectors.h +++ b/libavcodec/acelp_vectors.h @@ -26,7 +26,7 @@ #include /** Sparse representation for the algebraic codebook (fixed) vector */ -typedef struct { +typedef struct AMRFixed { int n; int x[10]; float y[10]; diff --git a/libavcodec/adx.h b/libavcodec/adx.h index 92abe5f163..47d9f24a85 100644 --- a/libavcodec/adx.h +++ b/libavcodec/adx.h @@ -35,11 +35,11 @@ #include "avcodec.h" -typedef struct { +typedef struct ADXChannelState { int s1,s2; } ADXChannelState; -typedef struct { +typedef struct ADXContext { AVFrame frame; int channels; ADXChannelState prev[2]; diff --git a/libavcodec/amrnbdata.h b/libavcodec/amrnbdata.h index c2e2f8a5e5..b7d1b89608 100644 --- a/libavcodec/amrnbdata.h +++ b/libavcodec/amrnbdata.h @@ -55,7 +55,7 @@ enum Mode { /** * AMRNB unpacked data subframe */ -typedef struct { +typedef struct AMRNBSubframe { uint16_t p_lag; ///< index to decode the pitch lag uint16_t p_gain; ///< index to decode the pitch gain uint16_t fixed_gain; ///< index to decode the fixed gain factor, for MODE_12k2 and MODE_7k95 @@ -65,7 +65,7 @@ typedef struct { /** * AMRNB unpacked data frame */ -typedef struct { +typedef struct AMRNBFrame { uint16_t lsf[5]; ///< lsf parameters: 5 parameters for MODE_12k2, only 3 for other modes AMRNBSubframe subframe[4]; ///< unpacked data for each subframe } AMRNBFrame; diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h index 83a93e997a..81f8b47d1b 100644 --- a/libavcodec/amrwbdata.h +++ b/libavcodec/amrwbdata.h @@ -66,7 +66,7 @@ enum Mode { /* All decoded parameters in these structs must be 2 bytes long * because of the direct indexing at the frame parsing */ -typedef struct { +typedef struct AMRWBSubFrame { uint16_t adap; ///< adaptive codebook index uint16_t ltp; ///< ltp-filtering flag uint16_t vq_gain; ///< VQ adaptive and innovative gains @@ -75,7 +75,7 @@ typedef struct { uint16_t pul_il[4]; ///< LSBs part of codebook index } AMRWBSubFrame; -typedef struct { +typedef struct AMRWBFrame { uint16_t vad; ///< voice activity detection flag uint16_t isp_id[7]; ///< index of ISP subvectors AMRWBSubFrame subframe[4]; ///< data for subframes diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h index 444f758e5d..0f89558e3d 100644 --- a/libavcodec/bytestream.h +++ b/libavcodec/bytestream.h @@ -29,11 +29,11 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" -typedef struct { +typedef struct GetByteContext { const uint8_t *buffer, *buffer_end, *buffer_start; } GetByteContext; -typedef struct { +typedef struct PutByteContext { uint8_t *buffer, *buffer_end, *buffer_start; int eof; } PutByteContext; diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index 8f5da54b3a..2e43124927 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -152,7 +152,7 @@ struct dec_2dvlc { int8_t max_run; }; -typedef struct { +typedef struct AVSContext { MpegEncContext s; CAVSDSPContext cdsp; Picture picture; ///< currently decoded frame diff --git a/libavcodec/dirac.h b/libavcodec/dirac.h index f8063d9e28..e5b79b09d2 100644 --- a/libavcodec/dirac.h +++ b/libavcodec/dirac.h @@ -31,7 +31,7 @@ #include "avcodec.h" #include "get_bits.h" -typedef struct { +typedef struct dirac_source_params { unsigned width; unsigned height; uint8_t chroma_format; ///< 0: 444 1: 422 2: 420 diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index 74cf0b522f..66b03499d7 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -25,7 +25,7 @@ #include #include "avcodec.h" -typedef struct { +typedef struct CIDEntry { int cid; unsigned int width, height; int interlaced; diff --git a/libavcodec/dnxhdenc.h b/libavcodec/dnxhdenc.h index 4484cf8023..c74b9a78ca 100644 --- a/libavcodec/dnxhdenc.h +++ b/libavcodec/dnxhdenc.h @@ -29,12 +29,12 @@ #include "mpegvideo.h" #include "dnxhddata.h" -typedef struct { +typedef struct RCCMPEntry { uint16_t mb; int value; } RCCMPEntry; -typedef struct { +typedef struct RCEntry { int ssd; int bits; } RCEntry; diff --git a/libavcodec/dwt.h b/libavcodec/dwt.h index f2d7864c65..e06f3f9393 100644 --- a/libavcodec/dwt.h +++ b/libavcodec/dwt.h @@ -26,7 +26,7 @@ typedef int DWTELEM; typedef short IDWTELEM; -typedef struct { +typedef struct DWTCompose { IDWTELEM *b0; IDWTELEM *b1; IDWTELEM *b2; diff --git a/libavcodec/g722.h b/libavcodec/g722.h index eb3b9b872e..bab1da48cc 100644 --- a/libavcodec/g722.h +++ b/libavcodec/g722.h @@ -30,7 +30,7 @@ #define PREV_SAMPLES_BUF_SIZE 1024 -typedef struct { +typedef struct G722Context { const AVClass *class; AVFrame frame; int bits_per_codeword; diff --git a/libavcodec/gsmdec_data.h b/libavcodec/gsmdec_data.h index 2ff2322ab1..61715c8858 100644 --- a/libavcodec/gsmdec_data.h +++ b/libavcodec/gsmdec_data.h @@ -25,7 +25,7 @@ #include #include "avcodec.h" -typedef struct { +typedef struct GSMContext { AVFrame frame; // Contains first 120 elements from the previous frame // (used by long_term_synth according to the "lag"), diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h index 881c30db47..043e6e3991 100644 --- a/libavcodec/huffman.h +++ b/libavcodec/huffman.h @@ -29,7 +29,7 @@ #include "avcodec.h" #include "get_bits.h" -typedef struct { +typedef struct Node { int16_t sym; int16_t n0; uint32_t count; diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h index 55164c2531..2ef8ea74bd 100644 --- a/libavcodec/indeo3data.h +++ b/libavcodec/indeo3data.h @@ -320,7 +320,7 @@ static const int32_t delta_tab_3_4_m10[79] = { TAB_3_4 }; static const int32_t delta_tab_3_5_m10[79] = { TAB_3_5 }; -typedef struct { +typedef struct vqEntry { const int16_t *deltas; ///< delta tables for 4x4 block modes const int32_t *deltas_m10; ///< delta tables for 8x8 block modes uint8_t num_dyads; ///< number of two-pixel deltas diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index be984f8df7..69673171a8 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -23,7 +23,7 @@ #include "mpegvideo.h" #include "intrax8dsp.h" -typedef struct{ +typedef struct IntraX8Context { VLC * j_ac_vlc[4];//they point to the static j_mb_vlc VLC * j_orient_vlc; VLC * j_dc_vlc[3]; diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index 1b654f8ead..7c6d1314de 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -40,7 +40,7 @@ /** * huffman codebook descriptor */ -typedef struct { +typedef struct IVIHuffDesc { int32_t num_rows; uint8_t xbits[16]; } IVIHuffDesc; @@ -48,7 +48,7 @@ typedef struct { /** * macroblock/block huffman table descriptor */ -typedef struct { +typedef struct IVIHuffTab { int32_t tab_sel; /// index of one of the predefined tables /// or "7" for custom one VLC *tab; /// pointer to the table associated with tab_sel @@ -85,7 +85,7 @@ typedef void (DCTransformPtr) (const int32_t *in, int16_t *out, uint32_t pitch, /** * run-value (RLE) table descriptor */ -typedef struct { +typedef struct RVMapDesc { uint8_t eob_sym; ///< end of block symbol uint8_t esc_sym; ///< escape symbol uint8_t runtab[256]; @@ -98,7 +98,7 @@ extern const RVMapDesc ff_ivi_rvmap_tabs[9]; /** * information for Indeo macroblock (16x16, 8x8 or 4x4) */ -typedef struct { +typedef struct IVIMbInfo { int16_t xpos; int16_t ypos; uint32_t buf_offs; ///< address in the output buffer for this mb @@ -113,7 +113,7 @@ typedef struct { /** * information for Indeo tile */ -typedef struct { +typedef struct IVITile { int xpos; int ypos; int width; @@ -130,7 +130,7 @@ typedef struct { /** * information for Indeo wavelet band */ -typedef struct { +typedef struct IVIBandDesc { int plane; ///< plane number this band belongs to int band_num; ///< band number int width; @@ -177,7 +177,7 @@ typedef struct { /** * color plane (luma or chroma) information */ -typedef struct { +typedef struct IVIPlaneDesc { uint16_t width; uint16_t height; uint8_t num_bands; ///< number of bands this plane subdivided into @@ -185,7 +185,7 @@ typedef struct { } IVIPlaneDesc; -typedef struct { +typedef struct IVIPicConfig { uint16_t pic_width; uint16_t pic_height; uint16_t chroma_width; diff --git a/libavcodec/libschroedinger.h b/libavcodec/libschroedinger.h index 8d04d2cdcb..f33014d766 100644 --- a/libavcodec/libschroedinger.h +++ b/libavcodec/libschroedinger.h @@ -31,7 +31,7 @@ #include "avcodec.h" -typedef struct { +typedef struct SchroVideoFormatInfo { uint16_t width; uint16_t height; uint16_t frame_rate_num; diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h index b001ad270d..d7711126b8 100644 --- a/libavcodec/mlp.h +++ b/libavcodec/mlp.h @@ -71,7 +71,7 @@ #define IIR 1 /** filter data */ -typedef struct { +typedef struct FilterParams { uint8_t order; ///< number of taps in filter uint8_t shift; ///< Right shift to apply to output of filter. @@ -79,7 +79,7 @@ typedef struct { } FilterParams; /** sample data coding information */ -typedef struct { +typedef struct ChannelParams { FilterParams filter_params[NUM_FILTERS]; int32_t coeff[NUM_FILTERS][MAX_FIR_ORDER]; diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h index 2ee3c6d416..86d4b6d393 100644 --- a/libavcodec/mpc.h +++ b/libavcodec/mpc.h @@ -41,7 +41,7 @@ #define MPC_FRAME_SIZE (BANDS * SAMPLES_PER_BAND) /** Subband structure - hold all variables for each subband */ -typedef struct { +typedef struct Band { int msf; ///< mid-stereo flag int res[2]; int scfi[2]; @@ -49,7 +49,7 @@ typedef struct { int Q[2]; }Band; -typedef struct { +typedef struct MPCContext { AVFrame frame; DSPContext dsp; MPADSPContext mpadsp; diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index 7560f3f4e4..1ee2d7e2c7 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -26,7 +26,7 @@ #include "get_bits.h" #include "put_bits.h" -typedef struct { +typedef struct MPEG4AudioConfig { int object_type; int sampling_index; int sample_rate; diff --git a/libavcodec/proresdsp.h b/libavcodec/proresdsp.h index f6578258a1..ba22259fcb 100644 --- a/libavcodec/proresdsp.h +++ b/libavcodec/proresdsp.h @@ -27,7 +27,7 @@ #define PRORES_BITS_PER_SAMPLE 10 ///< output precision of prores decoder -typedef struct { +typedef struct ProresDSPContext { int idct_permutation_type; uint8_t idct_permutation[64]; int dct_permutation_type; diff --git a/libavcodec/qcelpdata.h b/libavcodec/qcelpdata.h index 4c6cf15e3e..319833e904 100644 --- a/libavcodec/qcelpdata.h +++ b/libavcodec/qcelpdata.h @@ -37,7 +37,7 @@ /** * QCELP unpacked data frame */ -typedef struct { +typedef struct QCELPFrame { /// @name QCELP excitation codebook parameters /// @{ uint8_t cbsign[16]; ///< sign of the codebook gain for each codebook subframe @@ -73,7 +73,7 @@ typedef struct { */ static const float qcelp_hammsinc_table[4] = { -0.006822, 0.041249, -0.143459, 0.588863}; -typedef struct { +typedef struct QCELPBitmap { uint8_t index; /**< index into the QCELPContext structure */ uint8_t bitpos; /**< position of the lowest bit in the value's byte */ uint8_t bitlen; /**< number of bits to read */ diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h index 967afe02ee..73f83f0865 100644 --- a/libavcodec/ra144.h +++ b/libavcodec/ra144.h @@ -33,7 +33,7 @@ #define FRAMESIZE 20 ///< size of encoded frame #define LPC_ORDER 10 ///< order of LPC filter -typedef struct { +typedef struct RA144Context { AVCodecContext *avctx; AVFrame frame; LPCContext lpc_ctx; diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h index 4018e357a9..33d77edc8b 100644 --- a/libavcodec/roqvideo.h +++ b/libavcodec/roqvideo.h @@ -27,16 +27,16 @@ #include "bytestream.h" #include "dsputil.h" -typedef struct { +typedef struct roq_cell { unsigned char y[4]; unsigned char u, v; } roq_cell; -typedef struct { +typedef struct roq_qcell { int idx[4]; } roq_qcell; -typedef struct { +typedef struct motion_vect { int d[2]; } motion_vect; diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h index 18f843ba82..9fbfb34ddc 100644 --- a/libavcodec/rtjpeg.h +++ b/libavcodec/rtjpeg.h @@ -29,7 +29,7 @@ #define RTJPEG_FILE_VERSION 0 #define RTJPEG_HEADER_SIZE 12 -typedef struct { +typedef struct RTJpegContext { int w, h; DSPContext *dsp; uint8_t scan[64]; diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index 228b158e10..a47ad6eedb 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -37,7 +37,7 @@ /** * Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header. */ -typedef struct { +typedef struct SpectrumParameters { uint8_t bs_start_freq; uint8_t bs_stop_freq; uint8_t bs_xover_band; @@ -57,7 +57,7 @@ typedef struct { /** * Spectral Band Replication per channel data */ -typedef struct { +typedef struct SBRData { /** * @name Main bitstream data variables * @{ @@ -111,7 +111,7 @@ typedef struct { /** * Spectral Band Replication */ -typedef struct { +typedef struct SpectralBandReplication { int sample_rate; int start; int reset; diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index ee4967cdfe..6b72f6ad7e 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -29,7 +29,7 @@ extern const uint8_t ff_vorbis_channel_layout_offsets[8][8]; extern const uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8]; extern const uint64_t ff_vorbis_channel_layouts[9]; -typedef struct { +typedef struct vorbis_floor1_entry { uint16_t x; uint16_t sort; uint16_t low; diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index 000dfe0098..27539c7932 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -35,7 +35,7 @@ typedef struct vp56_context VP56Context; -typedef struct { +typedef struct VP56mv { DECLARE_ALIGNED(4, int16_t, x); int16_t y; } VP56mv; @@ -52,7 +52,7 @@ typedef int (*VP56ParseCoeffModels)(VP56Context *s); typedef int (*VP56ParseHeader)(VP56Context *s, const uint8_t *buf, int buf_size, int *golden_frame); -typedef struct { +typedef struct VP56RangeCoder { int high; int bits; /* stored negated (i.e. negative "bits" is a positive number of bits left) in order to eliminate a negate in cache refilling */ @@ -61,18 +61,18 @@ typedef struct { unsigned int code_word; } VP56RangeCoder; -typedef struct { +typedef struct VP56RefDc { uint8_t not_null_dc; VP56Frame ref_frame; DCTELEM dc_coeff; } VP56RefDc; -typedef struct { +typedef struct VP56Macroblock { uint8_t type; VP56mv mv; } VP56Macroblock; -typedef struct { +typedef struct VP56Model { uint8_t coeff_reorder[64]; /* used in vp6 only */ uint8_t coeff_index_to_pos[64]; /* used in vp6 only */ uint8_t vector_sig[2]; /* delta sign */ diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h index 39bb36d3eb..0535425d3d 100644 --- a/libavcodec/vp56data.h +++ b/libavcodec/vp56data.h @@ -51,7 +51,7 @@ typedef enum { VP56_MB_INTER_V2_GF = 9, /**< Inter MB, second vector, from golden frame */ } VP56mb; -typedef struct { +typedef struct VP56Tree { int8_t val; int8_t prob_idx; } VP56Tree; diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index a337173520..073a0335e0 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -72,13 +72,13 @@ enum inter_splitmvmode { VP8_SPLITMVMODE_NONE, ///< (only used in prediction) no split MVs }; -typedef struct { +typedef struct VP8FilterStrength { uint8_t filter_level; uint8_t inner_limit; uint8_t inner_filter; } VP8FilterStrength; -typedef struct { +typedef struct VP8Macroblock { uint8_t skip; // todo: make it possible to check for at least (i4x4 or split_mv) // in one op. are others needed? @@ -93,7 +93,7 @@ typedef struct { VP56mv bmv[16]; } VP8Macroblock; -typedef struct { +typedef struct VP8ThreadData { DECLARE_ALIGNED(16, DCTELEM, block)[6][4][16]; DECLARE_ALIGNED(16, DCTELEM, block_dc)[16]; /** @@ -123,7 +123,7 @@ typedef struct { } VP8ThreadData; #define MAX_THREADS 8 -typedef struct { +typedef struct VP8Context { VP8ThreadData *thread_data; AVCodecContext *avctx; AVFrame *framep[4]; diff --git a/libavcodec/w32pthreads.h b/libavcodec/w32pthreads.h index 8489f715db..91e7353fbb 100644 --- a/libavcodec/w32pthreads.h +++ b/libavcodec/w32pthreads.h @@ -42,7 +42,7 @@ #include "libavutil/internal.h" #include "libavutil/mem.h" -typedef struct { +typedef struct pthread_t { void *handle; void *(*func)(void* arg); void *arg; @@ -56,7 +56,7 @@ typedef CRITICAL_SECTION pthread_mutex_t; /* This is the CONDITIONAL_VARIABLE typedef for using Window's native * conditional variables on kernels 6.0+. * MinGW does not currently have this typedef. */ -typedef struct { +typedef struct pthread_cond_t { void *ptr; } pthread_cond_t; @@ -117,7 +117,7 @@ static inline int pthread_mutex_unlock(pthread_mutex_t *m) /* for pre-Windows 6.0 platforms we need to define and use our own condition * variable and api */ -typedef struct { +typedef struct win32_cond_t { pthread_mutex_t mtx_broadcast; pthread_mutex_t mtx_waiter_count; volatile int waiter_count; diff --git a/libavcodec/x86/dsputil_mmx.h b/libavcodec/x86/dsputil_mmx.h index 00c7fb12bf..bd14c5ad41 100644 --- a/libavcodec/x86/dsputil_mmx.h +++ b/libavcodec/x86/dsputil_mmx.h @@ -26,7 +26,7 @@ #include "libavcodec/dsputil.h" #include "libavutil/x86/asm.h" -typedef struct { uint64_t a, b; } xmm_reg; +typedef struct xmm_reg { uint64_t a, b; } xmm_reg; extern const uint64_t ff_bone; extern const uint64_t ff_wtwo; diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa-audio.h index a0e81d9e3e..26eaee6acf 100644 --- a/libavdevice/alsa-audio.h +++ b/libavdevice/alsa-audio.h @@ -42,7 +42,7 @@ #define ALSA_BUFFER_SIZE_MAX 32768 -typedef struct { +typedef struct AlsaData { AVClass *class; snd_pcm_t *h; int frame_size; ///< preferred size for reads and writes diff --git a/libavdevice/sndio_common.h b/libavdevice/sndio_common.h index dc75237b86..2f70213aed 100644 --- a/libavdevice/sndio_common.h +++ b/libavdevice/sndio_common.h @@ -28,7 +28,7 @@ #include "libavformat/avformat.h" #include "libavutil/log.h" -typedef struct { +typedef struct SndioData { AVClass *class; struct sio_hdl *hdl; enum AVCodecID codec_id; diff --git a/libavfilter/gradfun.h b/libavfilter/gradfun.h index 5d011309c6..876579a182 100644 --- a/libavfilter/gradfun.h +++ b/libavfilter/gradfun.h @@ -25,7 +25,7 @@ #include "avfilter.h" /// Holds instance-specific information for gradfun. -typedef struct { +typedef struct GradFunContext { int thresh; ///< threshold for gradient algorithm int radius; ///< blur radius int chroma_w; ///< width of the chroma planes diff --git a/libavfilter/yadif.h b/libavfilter/yadif.h index 9d23870cd1..06b39c69de 100644 --- a/libavfilter/yadif.h +++ b/libavfilter/yadif.h @@ -22,7 +22,7 @@ #include "libavutil/pixdesc.h" #include "avfilter.h" -typedef struct { +typedef struct YADIFContext { /** * 0: send 1 frame for each frame * 1: send 1 frame for each field diff --git a/libavformat/asf.h b/libavformat/asf.h index b72445def9..1d94a2c924 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -27,7 +27,7 @@ #define PACKET_SIZE 3200 -typedef struct { +typedef struct ASFStream { int num; unsigned char seq; /* use for reading */ @@ -50,7 +50,7 @@ typedef struct { typedef uint8_t ff_asf_guid[16]; -typedef struct { +typedef struct ASFMainHeader { ff_asf_guid guid; ///< generated by client computer uint64_t file_size; /**< in bytes * invalid if broadcasting */ @@ -76,7 +76,7 @@ typedef struct { } ASFMainHeader; -typedef struct { +typedef struct ASFIndex { uint32_t packet_number; uint16_t packet_count; } ASFIndex; diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h index af29629b8a..9c7b548c1d 100644 --- a/libavformat/audiointerleave.h +++ b/libavformat/audiointerleave.h @@ -26,7 +26,7 @@ #include "libavutil/fifo.h" #include "avformat.h" -typedef struct { +typedef struct AudioInterleaveContext { AVFifoBuffer *fifo; unsigned fifo_size; ///< size of currently allocated FIFO uint64_t dts; ///< current dts diff --git a/libavformat/httpauth.h b/libavformat/httpauth.h index bd0644906a..99bf43ffdc 100644 --- a/libavformat/httpauth.h +++ b/libavformat/httpauth.h @@ -32,7 +32,7 @@ typedef enum HTTPAuthType { HTTP_AUTH_DIGEST, /**< HTTP 1.1 Digest auth from RFC 2617 */ } HTTPAuthType; -typedef struct { +typedef struct DigestParams { char nonce[300]; /**< Server specified nonce */ char algorithm[10]; /**< Server specified digest algorithm */ char qop[30]; /**< Quality of protection, containing the one @@ -52,7 +52,7 @@ typedef struct { * HTTP Authentication state structure. Must be zero-initialized * before used with the functions below. */ -typedef struct { +typedef struct HTTPAuthState { /** * The currently chosen auth type. */ diff --git a/libavformat/isom.h b/libavformat/isom.h index b191699711..932b1d0a68 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -42,18 +42,18 @@ int ff_mov_lang_to_iso639(unsigned code, char to[4]); * Here we just use what is needed to read the chunks */ -typedef struct { +typedef struct MOVStts { int count; int duration; } MOVStts; -typedef struct { +typedef struct MOVStsc { int first; int count; int id; } MOVStsc; -typedef struct { +typedef struct MOVDref { uint32_t type; char *path; char *dir; @@ -62,14 +62,14 @@ typedef struct { int16_t nlvl_to, nlvl_from; } MOVDref; -typedef struct { +typedef struct MOVAtom { uint32_t type; int64_t size; /* total size (excluding the size and type fields) */ } MOVAtom; struct MOVParseTableEntry; -typedef struct { +typedef struct MOVFragment { unsigned track_id; uint64_t base_data_offset; uint64_t moof_offset; @@ -79,7 +79,7 @@ typedef struct { unsigned flags; } MOVFragment; -typedef struct { +typedef struct MOVTrackExt { unsigned track_id; unsigned stsd_id; unsigned duration; @@ -87,7 +87,7 @@ typedef struct { unsigned flags; } MOVTrackExt; -typedef struct { +typedef struct MOVSbgp { unsigned int count; unsigned int index; } MOVSbgp; diff --git a/libavformat/mms.h b/libavformat/mms.h index 5235581645..e89da41bb6 100644 --- a/libavformat/mms.h +++ b/libavformat/mms.h @@ -23,11 +23,11 @@ #include "url.h" -typedef struct { +typedef struct MMSStream { int id; }MMSStream; -typedef struct { +typedef struct MMSContext { URLContext *mms_hd; ///< TCP connection handle MMSStream *streams; diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 3be43e0fc9..e20ef1475b 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -60,13 +60,13 @@ typedef struct HintSample { int own_data; } HintSample; -typedef struct { +typedef struct HintSampleQueue { int size; int len; HintSample *samples; } HintSampleQueue; -typedef struct { +typedef struct MOVFragmentInfo { int64_t offset; int64_t time; int64_t duration; diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index 9f2ba3f8f3..89544f06f8 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -65,7 +65,7 @@ int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, const uint8_t *buf, int len); void ff_mpegts_parse_close(MpegTSContext *ts); -typedef struct { +typedef struct SLConfigDescr { int use_au_start; int use_au_end; int use_rand_acc_pt; @@ -82,7 +82,7 @@ typedef struct { int packet_seq_num_len; } SLConfigDescr; -typedef struct { +typedef struct Mp4Descr { int es_id; int dec_config_descr_len; uint8_t *dec_config_descr; diff --git a/libavformat/mxf.h b/libavformat/mxf.h index f39a013f7b..88322d1591 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -54,13 +54,13 @@ enum MXFFrameLayout { SeparateFields }; -typedef struct { +typedef struct KLVPacket { UID key; int64_t offset; uint64_t length; } KLVPacket; -typedef struct { +typedef struct MXFCodecUL { UID uid; unsigned matching_len; int id; diff --git a/libavformat/nut.h b/libavformat/nut.h index 419b123bee..3f09689bd1 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -53,14 +53,14 @@ typedef enum{ FLAG_INVALID =8192, /// -typedef struct { +typedef struct SWFContext { int64_t duration_pos; int64_t tag_pos; int64_t vframes_pos; diff --git a/libavutil/dict.h b/libavutil/dict.h index 72d1e9d25b..492da9a41c 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -68,7 +68,7 @@ #define AV_DICT_APPEND 32 /**< If the entry already exists, append to it. Note that no delimiter is added, the strings are simply concatenated. */ -typedef struct { +typedef struct AVDictionaryEntry { char *key; char *value; } AVDictionaryEntry; diff --git a/libavutil/lfg.h b/libavutil/lfg.h index 904d00a669..5e526c1dae 100644 --- a/libavutil/lfg.h +++ b/libavutil/lfg.h @@ -22,7 +22,7 @@ #ifndef AVUTIL_LFG_H #define AVUTIL_LFG_H -typedef struct { +typedef struct AVLFG { unsigned int state[64]; int index; } AVLFG; diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 3b304d5629..8f4605ea6b 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -115,13 +115,13 @@ const int *sws_getCoefficients(int colorspace); // when used for filters they must have an odd number of elements // coeffs cannot be shared between vectors -typedef struct { +typedef struct SwsVector { double *coeff; ///< pointer to the list of coefficients int length; ///< number of coefficients in the vector } SwsVector; // vectors can be shared -typedef struct { +typedef struct SwsFilter { SwsVector *lumH; SwsVector *lumV; SwsVector *chrH; -- cgit v1.2.3