[FFmpeg-cvslog] avformat: Don't anonymously typedef structs
Diego Biurrun
git at videolan.org
Sat Feb 14 21:14:20 CET 2015
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Sep 22 09:19:33 2014 +0200| [daf8cf358a098a903d59adb6c0d0cc3262a8c93e] | committer: Diego Biurrun
avformat: Don't anonymously typedef structs
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=daf8cf358a098a903d59adb6c0d0cc3262a8c93e
---
libavformat/adtsenc.c | 2 +-
libavformat/aiffdec.c | 2 +-
libavformat/aiffenc.c | 2 +-
libavformat/anm.c | 4 ++--
libavformat/ape.c | 4 ++--
libavformat/asfdec.c | 2 +-
libavformat/asfenc.c | 2 +-
libavformat/avidec.c | 2 +-
libavformat/avienc.c | 4 ++--
libavformat/bink.c | 2 +-
libavformat/c93.c | 4 ++--
libavformat/cafdec.c | 2 +-
libavformat/crypto.c | 2 +-
libavformat/dxa.c | 2 +-
libavformat/eacdata.c | 2 +-
libavformat/filmstripdec.c | 2 +-
libavformat/filmstripenc.c | 2 +-
libavformat/flvdec.c | 2 +-
libavformat/gif.c | 4 ++--
libavformat/gopher.c | 2 +-
libavformat/gsmdec.c | 2 +-
libavformat/http.c | 2 +-
libavformat/iff.c | 2 +-
libavformat/img2.c | 2 +-
libavformat/img2dec.c | 2 +-
libavformat/img2enc.c | 2 +-
libavformat/iss.c | 2 +-
libavformat/jvdec.c | 4 ++--
libavformat/latmenc.c | 2 +-
libavformat/lxfdec.c | 2 +-
libavformat/matroskadec.c | 40 +++++++++++++++++++-------------------
libavformat/matroskaenc.c | 6 +++---
libavformat/mm.c | 2 +-
libavformat/mmf.c | 2 +-
libavformat/mmsh.c | 2 +-
libavformat/mmst.c | 2 +-
libavformat/mpc.c | 4 ++--
libavformat/mpc8.c | 2 +-
libavformat/mpegenc.c | 4 ++--
libavformat/mpegts.c | 4 ++--
libavformat/mxfdec.c | 24 +++++++++++------------
libavformat/mxfenc.c | 8 ++++----
libavformat/nsvdec.c | 2 +-
libavformat/nuv.c | 2 +-
libavformat/oggenc.c | 6 +++---
libavformat/paf.c | 2 +-
libavformat/pva.c | 2 +-
libavformat/qcp.c | 2 +-
libavformat/r3d.c | 4 ++--
libavformat/rmdec.c | 2 +-
libavformat/rmenc.c | 4 ++--
libavformat/rtpdec_mpeg4.c | 2 +-
libavformat/rtpdec_qcelp.c | 2 +-
libavformat/segafilm.c | 2 +-
libavformat/segment.c | 2 +-
libavformat/sierravmd.c | 2 +-
libavformat/smoothstreamingenc.c | 6 +++---
libavformat/soxenc.c | 2 +-
libavformat/tls.c | 2 +-
libavformat/tta.c | 2 +-
libavformat/tty.c | 2 +-
libavformat/udp.c | 2 +-
libavformat/wtv.c | 6 +++---
libavformat/wvdec.c | 2 +-
libavformat/xwma.c | 2 +-
65 files changed, 117 insertions(+), 117 deletions(-)
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 5194e75..55d7510 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -28,7 +28,7 @@
#define ADTS_HEADER_SIZE 7
-typedef struct {
+typedef struct ADTSContext {
int write_adts;
int objecttype;
int sample_rate_index;
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 6243bcb..add843b 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -29,7 +29,7 @@
#define AIFF 0
#define AIFF_C_VERSION1 0xA2805140
-typedef struct {
+typedef struct AIFFInputContext {
int64_t data_end;
int block_duration;
} AIFFInputContext;
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index d4bffb3..aa68108 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -27,7 +27,7 @@
#include "aiff.h"
#include "avio_internal.h"
-typedef struct {
+typedef struct AIFFOutputContext {
int64_t form;
int64_t frames;
int64_t ssnd;
diff --git a/libavformat/anm.c b/libavformat/anm.c
index f781492..6b8e306 100644
--- a/libavformat/anm.c
+++ b/libavformat/anm.c
@@ -28,13 +28,13 @@
#include "avformat.h"
#include "internal.h"
-typedef struct {
+typedef struct Page {
int base_record;
unsigned int nb_records;
int size;
} Page;
-typedef struct {
+typedef struct AnmDemuxContext {
unsigned int nb_pages; /**< total pages in file */
unsigned int nb_records; /**< total records in file */
int page_table_offset;
diff --git a/libavformat/ape.c b/libavformat/ape.c
index d967a5d..09a756d 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -42,7 +42,7 @@
#define APE_EXTRADATA_SIZE 6
-typedef struct {
+typedef struct APEFrame {
int64_t pos;
int nblocks;
int size;
@@ -50,7 +50,7 @@ typedef struct {
int64_t pts;
} APEFrame;
-typedef struct {
+typedef struct APEContext {
/* Derived fields */
uint32_t junklength;
uint32_t firstframe;
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 5c23170..8522ce4 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -39,7 +39,7 @@
#include "asf.h"
#include "asfcrypt.h"
-typedef struct {
+typedef struct ASFContext {
const AVClass *class;
int asfid2avid[128]; ///< conversion table from asf ID 2 AVStream ID
ASFStream streams[128]; ///< it's max number and it's not that big
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index 79b44a7..beacd73 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -185,7 +185,7 @@
#define DATA_HEADER_SIZE 50
-typedef struct {
+typedef struct ASFContext {
uint32_t seqno;
int is_streamed;
ASFStream streams[128]; ///< it's max number and it's not that big
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 439d39d..20dc6e1 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -61,7 +61,7 @@ typedef struct AVIStream {
uint8_t *sub_buffer;
} AVIStream;
-typedef struct {
+typedef struct AVIContext {
int64_t riff_end;
int64_t movi_end;
int64_t fsize;
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 417a8e9..9c2936a 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -44,13 +44,13 @@ typedef struct AVIIndex {
AVIIentry** cluster;
} AVIIndex;
-typedef struct {
+typedef struct AVIContext {
int64_t riff_start, movi_list, odml_list;
int64_t frames_hdr_all;
int riff_id;
} AVIContext;
-typedef struct {
+typedef struct AVIStream {
int64_t frames_hdr_strm;
int audio_strm_length;
int packet_count;
diff --git a/libavformat/bink.c b/libavformat/bink.c
index 4d2a735..3224790 100644
--- a/libavformat/bink.c
+++ b/libavformat/bink.c
@@ -46,7 +46,7 @@ enum BinkAudFlags {
#define BINK_MAX_WIDTH 7680
#define BINK_MAX_HEIGHT 4800
-typedef struct {
+typedef struct BinkDemuxContext {
uint32_t file_size;
uint32_t num_audio_tracks;
diff --git a/libavformat/c93.c b/libavformat/c93.c
index 3f2a98f..fdb7a87 100644
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -24,13 +24,13 @@
#include "voc.h"
#include "libavutil/intreadwrite.h"
-typedef struct {
+typedef struct C93BlockRecord {
uint16_t index;
uint8_t length;
uint8_t frames;
} C93BlockRecord;
-typedef struct {
+typedef struct C93DemuxContext {
VocDecContext voc;
C93BlockRecord block_records[512];
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 4489eb2..a37ceaa 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -36,7 +36,7 @@
#include "libavutil/dict.h"
#include "caf.h"
-typedef struct {
+typedef struct CafContext {
int bytes_per_packet; ///< bytes in a packet, or 0 if variable
int frames_per_packet; ///< frames in a packet, or 0 if variable
int64_t num_bytes; ///< total number of bytes in stream
diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index 3bc33f2..6b19b5e 100644
--- a/libavformat/crypto.c
+++ b/libavformat/crypto.c
@@ -29,7 +29,7 @@
#define MAX_BUFFER_BLOCKS 150
#define BLOCKSIZE 16
-typedef struct {
+typedef struct CryptoContext {
const AVClass *class;
URLContext *hd;
uint8_t inbuffer [BLOCKSIZE*MAX_BUFFER_BLOCKS],
diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 78e7290..4a4d7c2 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -28,7 +28,7 @@
#define DXA_EXTRA_SIZE 9
-typedef struct{
+typedef struct DXAContext {
int frames;
int has_sound;
int bpc;
diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index b56ba1c..c81dec8 100644
--- a/libavformat/eacdata.c
+++ b/libavformat/eacdata.c
@@ -31,7 +31,7 @@
#include "avformat.h"
#include "internal.h"
-typedef struct {
+typedef struct CdataDemuxContext {
unsigned int channels;
unsigned int audio_pts;
} CdataDemuxContext;
diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c
index e4dee11..c82656e 100644
--- a/libavformat/filmstripdec.c
+++ b/libavformat/filmstripdec.c
@@ -30,7 +30,7 @@
#define RAND_TAG MKBETAG('R','a','n','d')
-typedef struct {
+typedef struct FilmstripDemuxContext {
int leading;
} FilmstripDemuxContext;
diff --git a/libavformat/filmstripenc.c b/libavformat/filmstripenc.c
index 8d1d2d8..0794b18 100644
--- a/libavformat/filmstripenc.c
+++ b/libavformat/filmstripenc.c
@@ -29,7 +29,7 @@
#define RAND_TAG MKBETAG('R','a','n','d')
-typedef struct {
+typedef struct FilmstripMuxContext {
int nb_frames;
} FilmstripMuxContext;
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 0167d17..ff86372 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -43,7 +43,7 @@
#define VALIDATE_INDEX_TS_THRESH 2500
-typedef struct {
+typedef struct FLVContext {
const AVClass *class; ///< Class for private options.
int trust_metadata; ///< configure streams according onMetaData
int wrong_dts; ///< wrong dts due to negative cts
diff --git a/libavformat/gif.c b/libavformat/gif.c
index 085c2e0..ddec778 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -58,7 +58,7 @@
* (byte 19) in the app_header */
#define GIF_ADD_APP_HEADER // required to enable looping of animated gif
-typedef struct {
+typedef struct rgb_triplet {
unsigned char r;
unsigned char g;
unsigned char b;
@@ -253,7 +253,7 @@ static int gif_image_write_image(AVIOContext *pb,
return 0;
}
-typedef struct {
+typedef struct GIFContext {
AVClass *class; /** Class for private options. */
int64_t time, file_time;
uint8_t buffer[100]; /* data chunks */
diff --git a/libavformat/gopher.c b/libavformat/gopher.c
index a149f7f..962fce7 100644
--- a/libavformat/gopher.c
+++ b/libavformat/gopher.c
@@ -28,7 +28,7 @@
#include "network.h"
#include "url.h"
-typedef struct {
+typedef struct GopherContext {
URLContext *hd;
} GopherContext;
diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c
index f9ecbaf..e73aa0d 100644
--- a/libavformat/gsmdec.c
+++ b/libavformat/gsmdec.c
@@ -29,7 +29,7 @@
#define GSM_BLOCK_SAMPLES 160
#define GSM_SAMPLE_RATE 8000
-typedef struct {
+typedef struct GSMDemuxerContext {
AVClass *class;
int sample_rate;
} GSMDemuxerContext;
diff --git a/libavformat/http.c b/libavformat/http.c
index f82002c..23df1b7 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -45,7 +45,7 @@
#define BUFFER_SIZE MAX_URL_SIZE
#define MAX_REDIRECTS 8
-typedef struct {
+typedef struct HTTPContext {
const AVClass *class;
URLContext *hd;
unsigned char buffer[BUFFER_SIZE], *buf_ptr, *buf_end;
diff --git a/libavformat/iff.c b/libavformat/iff.c
index 6be0fb7..bf09215 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -74,7 +74,7 @@ typedef enum {
BITMAP_BYTERUN1
} bitmap_compression_type;
-typedef struct {
+typedef struct IffDemuxContext {
uint64_t body_pos;
uint32_t body_size;
uint32_t sent_bytes;
diff --git a/libavformat/img2.c b/libavformat/img2.c
index 847c613..2128b2e 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -23,7 +23,7 @@
#include "libavutil/avstring.h"
#include "internal.h"
-typedef struct {
+typedef struct IdStrMap {
enum AVCodecID id;
const char *str;
} IdStrMap;
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index b73554e..fc6da1b 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -28,7 +28,7 @@
#include "avformat.h"
#include "internal.h"
-typedef struct {
+typedef struct VideoDemuxData {
const AVClass *class; /**< Class for private options. */
int img_first;
int img_last;
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 13e6828..eeb19c0 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "libavutil/opt.h"
-typedef struct {
+typedef struct VideoMuxData {
const AVClass *class; /**< Class for private options. */
int img_number;
int is_pipe;
diff --git a/libavformat/iss.c b/libavformat/iss.c
index 3f7f4fe..c86b425 100644
--- a/libavformat/iss.c
+++ b/libavformat/iss.c
@@ -35,7 +35,7 @@
#define ISS_SIG_LEN 15
#define MAX_TOKEN_SIZE 20
-typedef struct {
+typedef struct IssDemuxContext {
int packet_size;
int sample_start_pos;
} IssDemuxContext;
diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c
index 84d55da..8aebbf4 100644
--- a/libavformat/jvdec.c
+++ b/libavformat/jvdec.c
@@ -33,14 +33,14 @@
#define JV_PREAMBLE_SIZE 5
-typedef struct {
+typedef struct JVFrame {
int audio_size; /** audio packet size (bytes) */
int video_size; /** video packet size (bytes) */
int palette_size; /** palette size (bytes) */
int video_type; /** per-frame video compression type */
} JVFrame;
-typedef struct {
+typedef struct JVDemuxContext {
JVFrame *frames;
enum {
JV_AUDIO = 0,
diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index e5e2f87..5190ac7 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -26,7 +26,7 @@
#include "libavutil/opt.h"
#include "avformat.h"
-typedef struct {
+typedef struct LATMContext {
AVClass *av_class;
int off;
int channel_conf;
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index 192d4b0..e25f82e 100644
--- a/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@ -46,7 +46,7 @@ static const AVCodecTag lxf_tags[] = {
{ AV_CODEC_ID_NONE, 0 },
};
-typedef struct {
+typedef struct LXFDemuxContext {
int channels; ///< number of audio channels. zero means no audio
int frame_number; ///< current video frame
uint32_t video_format, packet_type, extended_size;
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 50585a3..697e14c 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -86,18 +86,18 @@ typedef const struct EbmlSyntax {
} def;
} EbmlSyntax;
-typedef struct {
+typedef struct EbmlList {
int nb_elem;
void *elem;
} EbmlList;
-typedef struct {
+typedef struct EbmlBin {
int size;
uint8_t *data;
int64_t pos;
} EbmlBin;
-typedef struct {
+typedef struct Ebml {
uint64_t version;
uint64_t max_size;
uint64_t id_length;
@@ -105,18 +105,18 @@ typedef struct {
uint64_t doctype_version;
} Ebml;
-typedef struct {
+typedef struct MatroskaTrackCompression {
uint64_t algo;
EbmlBin settings;
} MatroskaTrackCompression;
-typedef struct {
+typedef struct MatroskaTrackEncoding {
uint64_t scope;
uint64_t type;
MatroskaTrackCompression compression;
} MatroskaTrackEncoding;
-typedef struct {
+typedef struct MatroskaTrackVideo {
double frame_rate;
uint64_t display_width;
uint64_t display_height;
@@ -126,7 +126,7 @@ typedef struct {
uint64_t stereo_mode;
} MatroskaTrackVideo;
-typedef struct {
+typedef struct MatroskaTrackAudio {
double samplerate;
double out_samplerate;
uint64_t bitdepth;
@@ -143,7 +143,7 @@ typedef struct {
uint8_t *buf;
} MatroskaTrackAudio;
-typedef struct {
+typedef struct MatroskaTrack {
uint64_t num;
uint64_t uid;
uint64_t type;
@@ -165,7 +165,7 @@ typedef struct {
int ms_compat;
} MatroskaTrack;
-typedef struct {
+typedef struct MatroskaAttachment {
uint64_t uid;
char *filename;
char *mime;
@@ -174,7 +174,7 @@ typedef struct {
AVStream *stream;
} MatroskaAttachment;
-typedef struct {
+typedef struct MatroskaChapter {
uint64_t start;
uint64_t end;
uint64_t uid;
@@ -183,17 +183,17 @@ typedef struct {
AVChapter *chapter;
} MatroskaChapter;
-typedef struct {
+typedef struct MatroskaIndexPos {
uint64_t track;
uint64_t pos;
} MatroskaIndexPos;
-typedef struct {
+typedef struct MatroskaIndex {
uint64_t time;
EbmlList pos;
} MatroskaIndex;
-typedef struct {
+typedef struct MatroskaTag {
char *name;
char *string;
char *lang;
@@ -201,7 +201,7 @@ typedef struct {
EbmlList sub;
} MatroskaTag;
-typedef struct {
+typedef struct MatroskaTagTarget {
char *type;
uint64_t typevalue;
uint64_t trackuid;
@@ -209,27 +209,27 @@ typedef struct {
uint64_t attachuid;
} MatroskaTagTarget;
-typedef struct {
+typedef struct MatroskaTags {
MatroskaTagTarget target;
EbmlList tag;
} MatroskaTags;
-typedef struct {
+typedef struct MatroskaSeekhead {
uint64_t id;
uint64_t pos;
} MatroskaSeekhead;
-typedef struct {
+typedef struct MatroskaLevel {
uint64_t start;
uint64_t length;
} MatroskaLevel;
-typedef struct {
+typedef struct MatroskaCluster {
uint64_t timecode;
EbmlList blocks;
} MatroskaCluster;
-typedef struct {
+typedef struct MatroskaDemuxContext {
AVFormatContext *ctx;
/* EBML stuff */
@@ -273,7 +273,7 @@ typedef struct {
int contains_ssa;
} MatroskaDemuxContext;
-typedef struct {
+typedef struct MatroskaBlock {
uint64_t duration;
int64_t reference;
uint64_t non_simple;
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 3427c59..458a5f6 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -67,19 +67,19 @@ typedef struct mkv_seekhead {
int num_entries;
} mkv_seekhead;
-typedef struct {
+typedef struct mkv_cuepoint {
uint64_t pts;
int tracknum;
int64_t cluster_pos; ///< file offset of the cluster containing the block
} mkv_cuepoint;
-typedef struct {
+typedef struct mkv_cues {
int64_t segment_offset;
mkv_cuepoint *entries;
int num_entries;
} mkv_cues;
-typedef struct {
+typedef struct mkv_track {
int write_dts;
int64_t ts_offset;
} mkv_track;
diff --git a/libavformat/mm.c b/libavformat/mm.c
index 8c9cbd7..cdf1010 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -54,7 +54,7 @@
#define MM_PALETTE_COUNT 128
#define MM_PALETTE_SIZE (MM_PALETTE_COUNT*3)
-typedef struct {
+typedef struct MmDemuxContext {
unsigned int audio_pts, video_pts;
} MmDemuxContext;
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 61f1d7a..6fb63bf 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -26,7 +26,7 @@
#include "pcm.h"
#include "riff.h"
-typedef struct {
+typedef struct MMFContext {
int64_t atrpos, atsqpos, awapos;
int64_t data_size;
} MMFContext;
diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c
index 5e9d0bc..f8803a5 100644
--- a/libavformat/mmsh.c
+++ b/libavformat/mmsh.c
@@ -54,7 +54,7 @@ typedef enum {
CHUNK_TYPE_STREAM_CHANGE = 0x4324,
} ChunkType;
-typedef struct {
+typedef struct MMSHContext {
MMSContext mms;
int request_seq; ///< request packet sequence
int chunk_seq; ///< data packet sequence
diff --git a/libavformat/mmst.c b/libavformat/mmst.c
index 4f896e0..d45f7ba 100644
--- a/libavformat/mmst.c
+++ b/libavformat/mmst.c
@@ -85,7 +85,7 @@ typedef enum {
/*@}*/
} MMSSCPacketType;
-typedef struct {
+typedef struct MMSTContext {
MMSContext mms;
int outgoing_packet_seq; ///< Outgoing packet sequence number.
char path[256]; ///< Path of the resource being asked for.
diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index 5e771ae..1c8a295 100644
--- a/libavformat/mpc.c
+++ b/libavformat/mpc.c
@@ -31,12 +31,12 @@
#define DELAY_FRAMES 32
static const int mpc_rate[4] = { 44100, 48000, 37800, 32000 };
-typedef struct {
+typedef struct MPCFrame {
int64_t pos;
int size, skip;
}MPCFrame;
-typedef struct {
+typedef struct MPCContext {
int ver;
uint32_t curframe, lastframe;
uint32_t fcount;
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index 3564e81..07f12d2 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -47,7 +47,7 @@ enum MPCPacketTags{
static const int mpc8_rate[8] = { 44100, 48000, 37800, 32000, -1, -1, -1, -1 };
-typedef struct {
+typedef struct MPCContext {
int ver;
int64_t header_pos;
int64_t samples;
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 1c68a8f..fd3bbec 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -46,7 +46,7 @@ typedef struct PacketDesc {
struct PacketDesc *next;
} PacketDesc;
-typedef struct {
+typedef struct StreamInfo {
AVFifoBuffer *fifo;
uint8_t id;
int max_buffer_size; /* in bytes */
@@ -62,7 +62,7 @@ typedef struct {
int64_t vobu_start_pts;
} StreamInfo;
-typedef struct {
+typedef struct MpegMuxContext {
const AVClass *class;
int packet_size; /* required packet size */
int packet_number;
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 2f1d9d9..39eb74a 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -565,7 +565,7 @@ static int parse_section_header(SectionHeader *h,
return 0;
}
-typedef struct {
+typedef struct StreamType {
uint32_t stream_type;
enum AVMediaType codec_type;
enum AVCodecID codec_id;
@@ -1026,7 +1026,7 @@ static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid)
}
#define MAX_LEVEL 4
-typedef struct {
+typedef struct MP4DescrParseContext {
AVFormatContext *s;
AVIOContext pb;
Mp4Descr *descr;
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index b71c80f..2b8bd89 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -72,7 +72,7 @@ typedef enum {
OPSonyOpt, /* FATE sample, violates the spec in places */
} MXFOP;
-typedef struct {
+typedef struct MXFPartition {
int closed;
int complete;
MXFPartitionType type;
@@ -88,13 +88,13 @@ typedef struct {
int pack_length;
} MXFPartition;
-typedef struct {
+typedef struct MXFCryptoContext {
UID uid;
enum MXFMetadataSetType type;
UID source_container_ul;
} MXFCryptoContext;
-typedef struct {
+typedef struct MXFStructuralComponent {
UID uid;
enum MXFMetadataSetType type;
UID source_package_uid;
@@ -104,7 +104,7 @@ typedef struct {
int source_track_id;
} MXFStructuralComponent;
-typedef struct {
+typedef struct MXFSequence {
UID uid;
enum MXFMetadataSetType type;
UID data_definition_ul;
@@ -114,7 +114,7 @@ typedef struct {
uint8_t origin;
} MXFSequence;
-typedef struct {
+typedef struct MXFTrack {
UID uid;
enum MXFMetadataSetType type;
MXFSequence *sequence; /* mandatory, and only one */
@@ -127,7 +127,7 @@ typedef struct {
int64_t original_duration; /* st->duration in SampleRate/EditRate units */
} MXFTrack;
-typedef struct {
+typedef struct MXFDescriptor {
UID uid;
enum MXFMetadataSetType type;
UID essence_container_ul;
@@ -153,7 +153,7 @@ typedef struct {
enum AVPixelFormat pix_fmt;
} MXFDescriptor;
-typedef struct {
+typedef struct MXFIndexTableSegment {
UID uid;
enum MXFMetadataSetType type;
int edit_unit_byte_count;
@@ -168,7 +168,7 @@ typedef struct {
int nb_index_entries;
} MXFIndexTableSegment;
-typedef struct {
+typedef struct MXFPackage {
UID uid;
enum MXFMetadataSetType type;
UID package_uid;
@@ -178,13 +178,13 @@ typedef struct {
UID descriptor_ref;
} MXFPackage;
-typedef struct {
+typedef struct MXFMetadataSet {
UID uid;
enum MXFMetadataSetType type;
} MXFMetadataSet;
/* decoded index table */
-typedef struct {
+typedef struct MXFIndexTable {
int index_sid;
int body_sid;
int nb_ptses; /* number of PTSes or total duration of index */
@@ -195,7 +195,7 @@ typedef struct {
AVIndexEntry *fake_index; /* used for calling ff_index_search_timestamp() */
} MXFIndexTable;
-typedef struct {
+typedef struct MXFContext {
MXFPartition *partitions;
unsigned partitions_count;
MXFOP op;
@@ -230,7 +230,7 @@ enum MXFWrappingScheme {
/* NOTE: klv_offset is not set (-1) for local keys */
typedef int MXFMetadataReadFunc(void *arg, AVIOContext *pb, int tag, int size, UID uid, int64_t klv_offset);
-typedef struct {
+typedef struct MXFMetadataReadTableEntry {
const UID key;
MXFMetadataReadFunc *read;
int ctx_size;
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index ab6236f..69c0dd8 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -50,19 +50,19 @@ extern AVOutputFormat ff_mxf_d10_muxer;
#define EDIT_UNITS_PER_BODY 250
#define KAG_SIZE 512
-typedef struct {
+typedef struct MXFLocalTagPair {
int local_tag;
UID uid;
} MXFLocalTagPair;
-typedef struct {
+typedef struct MXFIndexEntry {
uint8_t flags;
uint64_t offset;
unsigned slice_offset; ///< offset of audio slice
uint16_t temporal_ref;
} MXFIndexEntry;
-typedef struct {
+typedef struct MXFStreamContext {
AudioInterleaveContext aic;
UID track_essence_element_key;
int index; ///< index in mxf_essence_container_uls table
@@ -74,7 +74,7 @@ typedef struct {
int closed_gop; ///< gop is closed, used in mpeg-2 frame parsing
} MXFStreamContext;
-typedef struct {
+typedef struct MXFContainerEssenceEntry {
UID container_ul;
UID element_ul;
UID codec_ul;
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 5662279..c8ac74c 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -165,7 +165,7 @@ typedef struct NSVStream {
int cum_len; /* temporary storage (used during seek) */
} NSVStream;
-typedef struct {
+typedef struct NSVContext {
int base_offset;
int NSVf_end;
uint32_t *nsvs_file_offset;
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 586aec6..c9fa38a 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -33,7 +33,7 @@ static const AVCodecTag nuv_audio_tags[] = {
{ AV_CODEC_ID_NONE, 0 },
};
-typedef struct {
+typedef struct NUVContext {
int v_id;
int a_id;
int rtjpg_video;
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 1b2644d..70c7817 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -35,7 +35,7 @@
#define MAX_PAGE_SIZE 65025
-typedef struct {
+typedef struct OGGPage {
int64_t start_granule;
int64_t granule;
int stream_index;
@@ -46,7 +46,7 @@ typedef struct {
uint16_t size;
} OGGPage;
-typedef struct {
+typedef struct OGGStreamContext {
unsigned page_counter;
uint8_t *header[3];
int header_len[3];
@@ -66,7 +66,7 @@ typedef struct OGGPageList {
struct OGGPageList *next;
} OGGPageList;
-typedef struct {
+typedef struct OGGContext {
const AVClass *class;
OGGPageList *page_list;
int pref_size; ///< preferred page size (0 => fill all segments)
diff --git a/libavformat/paf.c b/libavformat/paf.c
index 18bf353..9ee4cd8 100644
--- a/libavformat/paf.c
+++ b/libavformat/paf.c
@@ -28,7 +28,7 @@
#define PAF_SOUND_SAMPLES 2205
#define PAF_SOUND_FRAME_SIZE ((256 + PAF_SOUND_SAMPLES) * 2)
-typedef struct {
+typedef struct PAFDemuxContext {
uint32_t buffer_size;
uint32_t frame_blks;
uint32_t nb_frames;
diff --git a/libavformat/pva.c b/libavformat/pva.c
index 3abfc18..2c485d6 100644
--- a/libavformat/pva.c
+++ b/libavformat/pva.c
@@ -28,7 +28,7 @@
#define PVA_AUDIO_PAYLOAD 0x02
#define PVA_MAGIC (('A' << 8) + 'V')
-typedef struct {
+typedef struct PVAContext {
int continue_pes;
} PVAContext;
diff --git a/libavformat/qcp.c b/libavformat/qcp.c
index 30d362f..be06e2f 100644
--- a/libavformat/qcp.c
+++ b/libavformat/qcp.c
@@ -31,7 +31,7 @@
#include "libavutil/intreadwrite.h"
#include "avformat.h"
-typedef struct {
+typedef struct QCPContext {
uint32_t data_size; ///< size of data chunk
#define QCP_MAX_MODE 4
diff --git a/libavformat/r3d.c b/libavformat/r3d.c
index 607cd3d..bcea462 100644
--- a/libavformat/r3d.c
+++ b/libavformat/r3d.c
@@ -25,13 +25,13 @@
#include "avformat.h"
#include "internal.h"
-typedef struct {
+typedef struct R3DContext {
unsigned video_offsets_count;
unsigned *video_offsets;
unsigned rdvo_offset;
} R3DContext;
-typedef struct {
+typedef struct Atom {
unsigned size;
uint32_t tag;
uint64_t offset;
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 9173dde..cae89a9 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -54,7 +54,7 @@ struct RMStream {
int32_t deint_id; ///< deinterleaver used in audio stream
};
-typedef struct {
+typedef struct RMDemuxContext {
int nb_packets;
int old_format;
int current_stream;
diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c
index 9ff9f31..6d8fa43 100644
--- a/libavformat/rmenc.c
+++ b/libavformat/rmenc.c
@@ -23,7 +23,7 @@
#include "rm.h"
#include "libavutil/dict.h"
-typedef struct {
+typedef struct StreamInfo {
int nb_packets;
int packet_total_size;
int packet_max_size;
@@ -36,7 +36,7 @@ typedef struct {
AVCodecContext *enc;
} StreamInfo;
-typedef struct {
+typedef struct RMMuxContext {
StreamInfo streams[2];
StreamInfo *audio_stream, *video_stream;
int data_pos; /* position of the data after the header */
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c
index 4aedeea..0c0d336 100644
--- a/libavformat/rtpdec_mpeg4.c
+++ b/libavformat/rtpdec_mpeg4.c
@@ -63,7 +63,7 @@ struct PayloadContext {
int buf_pos, buf_size;
};
-typedef struct {
+typedef struct AttrNameMap {
const char *str;
uint16_t type;
uint32_t offset;
diff --git a/libavformat/rtpdec_qcelp.c b/libavformat/rtpdec_qcelp.c
index 45a89ae..9c48314 100644
--- a/libavformat/rtpdec_qcelp.c
+++ b/libavformat/rtpdec_qcelp.c
@@ -25,7 +25,7 @@ static const uint8_t frame_sizes[] = {
1, 4, 8, 17, 35
};
-typedef struct {
+typedef struct InterleavePacket {
int pos;
int size;
/* The largest frame is 35 bytes, only 10 frames are allowed per
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 53e2066..04b8177 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -37,7 +37,7 @@
#define CVID_TAG MKBETAG('c', 'v', 'i', 'd')
#define RAW_TAG MKBETAG('r', 'a', 'w', ' ')
-typedef struct {
+typedef struct film_sample {
int stream;
int64_t sample_offset;
unsigned int sample_size;
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 824bbf7..55ba656 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -30,7 +30,7 @@
#include "libavutil/parseutils.h"
#include "libavutil/mathematics.h"
-typedef struct {
+typedef struct SegmentContext {
const AVClass *class; /**< Class for private options. */
int number;
AVOutputFormat *oformat;
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index 8316388..279633f 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -35,7 +35,7 @@
#define VMD_HEADER_SIZE 0x0330
#define BYTES_PER_FRAME_RECORD 16
-typedef struct {
+typedef struct vmd_frame {
int stream_index;
int64_t frame_offset;
unsigned int frame_size;
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index 1db2dba..6af8b39 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -38,7 +38,7 @@
#include "libavutil/mathematics.h"
#include "libavutil/intreadwrite.h"
-typedef struct {
+typedef struct Fragment {
char file[1024];
char infofile[1024];
int64_t start_time, duration;
@@ -46,7 +46,7 @@ typedef struct {
int64_t start_pos, size;
} Fragment;
-typedef struct {
+typedef struct OutputStream {
AVFormatContext *ctx;
int ctx_inited;
char dirname[1024];
@@ -66,7 +66,7 @@ typedef struct {
int audio_tag;
} OutputStream;
-typedef struct {
+typedef struct SmoothStreamingContext {
const AVClass *class; /* Class for private options. */
int window_size;
int extra_window_size;
diff --git a/libavformat/soxenc.c b/libavformat/soxenc.c
index 4b8955c..17de178 100644
--- a/libavformat/soxenc.c
+++ b/libavformat/soxenc.c
@@ -36,7 +36,7 @@
#include "avio_internal.h"
#include "sox.h"
-typedef struct {
+typedef struct SoXContext {
int64_t header_size;
} SoXContext;
diff --git a/libavformat/tls.c b/libavformat/tls.c
index 817aedc..1832f2b 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -57,7 +57,7 @@
#include <poll.h>
#endif
-typedef struct {
+typedef struct TLSContext {
const AVClass *class;
URLContext *tcp;
#if CONFIG_GNUTLS
diff --git a/libavformat/tta.c b/libavformat/tta.c
index b7efe18..bc86a77 100644
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -25,7 +25,7 @@
#include "id3v1.h"
#include "libavutil/dict.h"
-typedef struct {
+typedef struct TTAContext {
int totalframes, currentframe;
int frame_size;
int last_frame_size;
diff --git a/libavformat/tty.c b/libavformat/tty.c
index 0ae1510..3a34dd8 100644
--- a/libavformat/tty.c
+++ b/libavformat/tty.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "sauce.h"
-typedef struct {
+typedef struct TtyDemuxContext {
AVClass *class;
int chars_per_frame;
uint64_t fsize; /**< file size less metadata buffer */
diff --git a/libavformat/udp.c b/libavformat/udp.c
index bfa8cf2..939d2c1 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -40,7 +40,7 @@
#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
#endif
-typedef struct {
+typedef struct UDPContext {
int udp_fd;
int ttl;
int buffer_size;
diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index 5080d29..7fe737e 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -57,7 +57,7 @@
#define SHIFT_SECTOR_BITS(a) ((int64_t)(a) << WTV_SECTOR_BITS)
-typedef struct {
+typedef struct WtvFile {
AVIOContext *pb_filesystem; /** file system (AVFormatContext->pb) */
int sector_bits; /** sector shift bits; used to convert sector number into pb_filesystem offset */
@@ -324,11 +324,11 @@ static void wtvfile_close(AVIOContext *pb)
*
*/
-typedef struct {
+typedef struct WtvStream {
int seen_data;
} WtvStream;
-typedef struct {
+typedef struct WtvContext {
AVIOContext *pb; /** timeline file */
int64_t epoch;
int64_t pts; /** pts for next data chunk */
diff --git a/libavformat/wvdec.c b/libavformat/wvdec.c
index 1a2a722..75eddd2 100644
--- a/libavformat/wvdec.c
+++ b/libavformat/wvdec.c
@@ -47,7 +47,7 @@ static const int wv_rates[16] = {
32000, 44100, 48000, 64000, 88200, 96000, 192000, -1
};
-typedef struct {
+typedef struct WVContext {
uint8_t block_header[WV_HEADER_SIZE];
WvHeader header;
int rate, chan, bpp;
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index af916ad..4a30001 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -30,7 +30,7 @@
* Demuxer for xWMA, a Microsoft audio container used by XAudio 2.
*/
-typedef struct {
+typedef struct XWMAContext {
int64_t data_end;
} XWMAContext;
More information about the ffmpeg-cvslog
mailing list