diff options
author | Diego Biurrun <diego@biurrun.de> | 2012-09-27 10:19:53 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2012-10-06 09:27:11 +0200 |
commit | e4cbf7529ba4bcfff47c44b0d026ecb356004c8c (patch) | |
tree | a1c3a3fb245220594acbf15f7c9ec7344bb03db7 /libavformat | |
parent | 76f644d9f7f511a4e8dbc4938d40c43b49383c22 (diff) | |
download | ffmpeg-e4cbf7529ba4bcfff47c44b0d026ecb356004c8c.tar.gz |
Give all anonymously typedeffed structs in headers a name
Anonymous structs cannot be forward declared and have no benefit.
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/asf.h | 6 | ||||
-rw-r--r-- | libavformat/audiointerleave.h | 2 | ||||
-rw-r--r-- | libavformat/httpauth.h | 4 | ||||
-rw-r--r-- | libavformat/isom.h | 14 | ||||
-rw-r--r-- | libavformat/mms.h | 4 | ||||
-rw-r--r-- | libavformat/movenc.h | 4 | ||||
-rw-r--r-- | libavformat/mpegts.h | 4 | ||||
-rw-r--r-- | libavformat/mxf.h | 4 | ||||
-rw-r--r-- | libavformat/nut.h | 12 | ||||
-rw-r--r-- | libavformat/rtpdec.h | 2 | ||||
-rw-r--r-- | libavformat/swf.h | 2 |
11 files changed, 29 insertions, 29 deletions
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, ///<if set, frame_code is invalid } Flag; -typedef struct { +typedef struct Syncpoint { uint64_t pos; uint64_t back_ptr; // uint64_t global_key_pts; int64_t ts; } Syncpoint; -typedef struct { +typedef struct FrameCode { uint16_t flags; uint8_t stream_id; uint16_t size_mul; @@ -70,7 +70,7 @@ typedef struct { uint8_t header_idx; } FrameCode; -typedef struct { +typedef struct StreamContext { int last_flags; int skip_until_key_frame; int64_t last_pts; @@ -81,11 +81,11 @@ typedef struct { int decode_delay; //FIXME duplicate of has_b_frames } StreamContext; -typedef struct { +typedef struct ChapterContext { AVRational *time_base; } ChapterContext; -typedef struct { +typedef struct NUTContext { AVFormatContext *avf; // int written_packet_size; // int64_t packet_start; @@ -106,7 +106,7 @@ typedef struct { extern const AVCodecTag ff_nut_subtitle_tags[]; extern const AVCodecTag ff_nut_video_tags[]; -typedef struct { +typedef struct Dispositions { char str[9]; int flag; } Dispositions; diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 20257a7d39..7f14aa2d68 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -72,7 +72,7 @@ void ff_rtp_send_punch_packets(URLContext* rtp_handle); int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, int count); // these statistics are used for rtcp receiver reports... -typedef struct { +typedef struct RTPStatistics { uint16_t max_seq; ///< highest sequence number seen uint32_t cycles; ///< shifted count of sequence number cycles uint32_t base_seq; ///< base sequence number diff --git a/libavformat/swf.h b/libavformat/swf.h index b1e477b828..97e7b2d4f0 100644 --- a/libavformat/swf.h +++ b/libavformat/swf.h @@ -64,7 +64,7 @@ #undef NDEBUG #include <assert.h> -typedef struct { +typedef struct SWFContext { int64_t duration_pos; int64_t tag_pos; int64_t vframes_pos; |