Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
  avformat: Don't anonymously typedef structs

Conflicts:
	libavformat/adtsenc.c
	libavformat/aiffenc.c
	libavformat/avidec.c
	libavformat/gif.c
	libavformat/iff.c
	libavformat/img2dec.c
	libavformat/jvdec.c
	libavformat/matroskadec.c
	libavformat/udp.c
	libavformat/wtvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

65 files changed, 120 insertions, 120 deletions

diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 89c8869d35..7448ec794f 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -31,7 +31,7 @@
 
 #define ADTS_HEADER_SIZE 7
 
-typedef struct {
+typedef struct ADTSContext {
     AVClass *class;
     int write_adts;
     int objecttype;
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 301d90f00a..bc1a21937d 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -33,7 +33,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 90fc43346c..e2828e7508 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -30,7 +30,7 @@
 #include "isom.h"
 #include "id3v2.h"
 
-typedef struct {
+typedef struct AIFFOutputContext {
     const AVClass *class;
     int64_t form;
     int64_t frames;
diff --git a/libavformat/anm.c b/libavformat/anm.c
index 5196cb8e4e..f718797310 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 fafc1dfca7..28f73d3072 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -40,7 +40,7 @@
 
 #define APE_EXTRADATA_SIZE 6
 
-typedef struct {
+typedef struct APEFrame {
     int64_t pos;
     int nblocks;
     int size;
@@ -48,7 +48,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 1b77f02ab4..d5facddef1 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 13bd5af695..f4f64a62e1 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -183,7 +183,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 963af34dcf..54c87a2559 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -64,7 +64,7 @@ typedef struct AVIStream {
     int64_t seek_pos;
 } AVIStream;
 
-typedef struct {
+typedef struct AVIContext {
     const AVClass *class;
     int64_t riff_end;
     int64_t movi_end;
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 944c1548a9..53c2fe7eac 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -54,13 +54,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;
     int64_t audio_strm_length;
     int packet_count;
diff --git a/libavformat/bink.c b/libavformat/bink.c
index 395c8d9aa8..92ce26198d 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 93a61be838..d67afcfb4b 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 7d518d78d2..e31c0a52bc 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 22529fb521..f56ee4eb17 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 9da2ffdc2d..44033563f8 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 57e514566f..165ff1af99 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 b76d4b7e1d..cdbb93b11a 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 7c9bc6dcc0..9e2c71082f 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 572268f2ad..1701f76e80 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -39,7 +39,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 a729cc70b3..e5d558df07 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -101,7 +101,7 @@ static int gif_image_write_header(AVIOContext *pb, const AVCodecContext *avctx,
     return 0;
 }
 
-typedef struct {
+typedef struct GIFContext {
     AVClass *class;
     int loop;
     int last_delay;
diff --git a/libavformat/gopher.c b/libavformat/gopher.c
index 9dc155ad11..a5340d276c 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 dbe557bfdd..a9865dbee9 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 b9e18701fb..55dcb6ec67 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 e7c240c5d5..7235bc1c9c 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -98,7 +98,7 @@ typedef enum {
     COMP_EXP
 } svx8_compression_type;
 
-typedef struct {
+typedef struct IffDemuxContext {
     int      is_64bit;  ///< chunk size is 64-bit
     int64_t  body_pos;
     int64_t  body_end;
diff --git a/libavformat/img2.c b/libavformat/img2.c
index d6f1244650..8493a3e824 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/img2.h b/libavformat/img2.h
index 58a6833835..67bd7a325f 100644
--- a/libavformat/img2.h
+++ b/libavformat/img2.h
@@ -30,7 +30,7 @@
 #include <glob.h>
 #endif
 
-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 b0bd252158..f56c39e6d3 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -31,7 +31,7 @@
 #include "avio_internal.h"
 #include "internal.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 e9945313d6..fbde505a2d 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 21eb14d265..64d31e0ee6 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 cb79e84a91..17dbf33b72 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -29,7 +29,7 @@
 
 #define MAX_EXTRADATA_SIZE 1024
 
-typedef struct {
+typedef struct LATMContext {
     AVClass *av_class;
     int off;
     int channel_conf;
diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
index fb37da7827..ce5da820d0 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 4c92a9d2ef..6c0d0d5c15 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -91,18 +91,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;
@@ -110,24 +110,24 @@ typedef struct {
     uint64_t doctype_version;
 } Ebml;
 
-typedef struct {
+typedef struct MatroskaTrackCompression {
     uint64_t algo;
     EbmlBin  settings;
 } MatroskaTrackCompression;
 
-typedef struct {
+typedef struct MatroskaTrackEncryption {
     uint64_t algo;
     EbmlBin  key_id;
 } MatroskaTrackEncryption;
 
-typedef struct {
+typedef struct MatroskaTrackEncoding {
     uint64_t scope;
     uint64_t type;
     MatroskaTrackCompression compression;
     MatroskaTrackEncryption encryption;
 } MatroskaTrackEncoding;
 
-typedef struct {
+typedef struct MatroskaTrackVideo {
     double   frame_rate;
     uint64_t display_width;
     uint64_t display_height;
@@ -138,7 +138,7 @@ typedef struct {
     uint64_t alpha_mode;
 } MatroskaTrackVideo;
 
-typedef struct {
+typedef struct MatroskaTrackAudio {
     double   samplerate;
     double   out_samplerate;
     uint64_t bitdepth;
@@ -155,16 +155,16 @@ typedef struct {
     uint8_t *buf;
 } MatroskaTrackAudio;
 
-typedef struct {
+typedef struct MatroskaTrackPlane {
     uint64_t uid;
     uint64_t type;
 } MatroskaTrackPlane;
 
-typedef struct {
+typedef struct MatroskaTrackOperation {
     EbmlList combine_planes;
 } MatroskaTrackOperation;
 
-typedef struct {
+typedef struct MatroskaTrack {
     uint64_t num;
     uint64_t uid;
     uint64_t type;
@@ -189,7 +189,7 @@ typedef struct {
     uint64_t max_block_additional_id;
 } MatroskaTrack;
 
-typedef struct {
+typedef struct MatroskaAttachment {
     uint64_t uid;
     char *filename;
     char *mime;
@@ -198,7 +198,7 @@ typedef struct {
     AVStream *stream;
 } MatroskaAttachment;
 
-typedef struct {
+typedef struct MatroskaChapter {
     uint64_t start;
     uint64_t end;
     uint64_t uid;
@@ -207,17 +207,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;
@@ -225,7 +225,7 @@ typedef struct {
     EbmlList sub;
 } MatroskaTag;
 
-typedef struct {
+typedef struct MatroskaTagTarget {
     char    *type;
     uint64_t typevalue;
     uint64_t trackuid;
@@ -233,33 +233,33 @@ 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 MatroskaLevel1Element {
     uint64_t id;
     uint64_t pos;
     int parsed;
 } MatroskaLevel1Element;
 
-typedef struct {
+typedef struct MatroskaDemuxContext {
     AVFormatContext *ctx;
 
     /* EBML stuff */
@@ -309,7 +309,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 eb6e859c26..8690025dc5 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -71,7 +71,7 @@ typedef struct mkv_seekhead {
     int                     num_entries;
 } mkv_seekhead;
 
-typedef struct {
+typedef struct mkv_cuepoint {
     uint64_t        pts;
     int             stream_idx;
     int             tracknum;
@@ -80,13 +80,13 @@ typedef struct {
     int64_t         duration;           ///< duration of the block according to time base
 } 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;
     int             has_cue;
     int64_t         ts_offset;
diff --git a/libavformat/mm.c b/libavformat/mm.c
index 4315802f73..81ae1a510e 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 e96311238d..c2acec91eb 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -27,7 +27,7 @@
 #include "rawenc.h"
 #include "riff.h"
 
-typedef struct {
+typedef struct MMFContext {
     int64_t atrpos, atsqpos, awapos;
     int64_t data_end;
     int stereo;
diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c
index dac5d9f653..38e6b319c6 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;
     uint8_t location[1024];
     int request_seq;  ///< request packet sequence
diff --git a/libavformat/mmst.c b/libavformat/mmst.c
index 653b403bc4..65c4f4438e 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 8f8ac9c389..a62a3f2723 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 684a0eeae0..0015fe4942 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 3ef2b24692..9cee9674a0 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -43,7 +43,7 @@ typedef struct PacketDesc {
     struct PacketDesc *next;
 } PacketDesc;
 
-typedef struct {
+typedef struct StreamInfo {
     AVFifoBuffer *fifo;
     uint8_t id;
     int max_buffer_size; /* in bytes */
@@ -59,7 +59,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 afda648866..9e9ad4765e 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -656,7 +656,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;
@@ -1215,7 +1215,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 181e9e6c3f..1376a7a3be 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -75,7 +75,7 @@ typedef enum {
     OPSONYOpt,  /* FATE sample, violates the spec in places */
 } MXFOP;
 
-typedef struct {
+typedef struct MXFPartition {
     int closed;
     int complete;
     MXFPartitionType type;
@@ -92,13 +92,13 @@ typedef struct {
     int64_t pack_ofs;               ///< absolute offset of pack in file, including run-in
 } 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;
@@ -108,7 +108,7 @@ typedef struct {
     int source_track_id;
 } MXFStructuralComponent;
 
-typedef struct {
+typedef struct MXFSequence {
     UID uid;
     enum MXFMetadataSetType type;
     UID data_definition_ul;
@@ -118,7 +118,7 @@ typedef struct {
     uint8_t origin;
 } MXFSequence;
 
-typedef struct {
+typedef struct MXFTrack {
     UID uid;
     enum MXFMetadataSetType type;
     int drop_frame;
@@ -154,7 +154,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;
@@ -181,7 +181,7 @@ typedef struct {
     enum AVPixelFormat pix_fmt;
 } MXFDescriptor;
 
-typedef struct {
+typedef struct MXFIndexTableSegment {
     UID uid;
     enum MXFMetadataSetType type;
     int edit_unit_byte_count;
@@ -196,7 +196,7 @@ typedef struct {
     int nb_index_entries;
 } MXFIndexTableSegment;
 
-typedef struct {
+typedef struct MXFPackage {
     UID uid;
     enum MXFMetadataSetType type;
     UID package_uid;
@@ -208,13 +208,13 @@ typedef struct {
     char *name;
 } 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 */
@@ -225,7 +225,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;
@@ -259,7 +259,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 17ad132865..dfa647de3c 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -57,19 +57,19 @@ extern AVOutputFormat ff_mxf_opatom_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
@@ -84,7 +84,7 @@ typedef struct {
     int video_bit_rate;
 } 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 632667ca97..59b7938200 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -162,7 +162,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 65d2e56f19..001d9c8860 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 50af8bde17..ca40063f0d 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 618994cd68..4fc5006f40 100644
--- a/libavformat/paf.c
+++ b/libavformat/paf.c
@@ -26,7 +26,7 @@
 
 #define MAGIC "Packed Animation File V1.0\n(c) 1992-96 Amazing Studio\x0a\x1a"
 
-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 18ab1cd3fc..900ad6133d 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 ccfa047529..9e2eedfe85 100644
--- a/libavformat/qcp.c
+++ b/libavformat/qcp.c
@@ -32,7 +32,7 @@
 #include "avformat.h"
 #include "riff.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 60e96bfbcd..6dda1746dd 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 9418848e40..c0afa7fb6f 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -56,7 +56,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 2e50ed338c..d019e1beab 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 9655d302a3..f22086d5a8 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 eebcdd025b..f2893499d5 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 b0f0c4eb7a..f8b3eee3c0 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -38,7 +38,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 0ee65bba92..b65a2ebdba 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -65,7 +65,7 @@ typedef enum {
 #define SEGMENT_LIST_FLAG_CACHE 1
 #define SEGMENT_LIST_FLAG_LIVE  2
 
-typedef struct {
+typedef struct SegmentContext {
     const AVClass *class;  /**< Class for private options. */
     int segment_idx;       ///< index of the segment file to write, starting from 0
     int segment_idx_wrap;  ///< number after which the index wraps
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index 2046f91bca..8bdd973080 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -36,7 +36,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 075b303aa9..07173a96f9 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 95af10c49a..bfa90025e1 100644
--- a/libavformat/soxenc.c
+++ b/libavformat/soxenc.c
@@ -37,7 +37,7 @@
 #include "rawenc.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 942083bac9..a19415d9c0 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 a782bd7737..7566939d48 100644
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -28,7 +28,7 @@
 #include "libavutil/crc.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 909b550d42..9022e915fa 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 91c7910a95..3a65f55882 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -71,7 +71,7 @@
 #define UDP_MAX_PKT_SIZE 65536
 #define UDP_HEADER_SIZE 8
 
-typedef struct {
+typedef struct UDPContext {
     const AVClass *class;
     int udp_fd;
     int ttl;
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index f20030009a..a752ee22bd 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -49,7 +49,7 @@
  *
  */
 
-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 */
@@ -316,11 +316,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 76768cdf26..4e58512393 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 b1721207e7..075a85a2e7 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;