avformat: Don't anonymously typedef structs

pull/110/merge
Diego Biurrun 10 years ago
parent 7769be590c
commit daf8cf358a
  1. 2
      libavformat/adtsenc.c
  2. 2
      libavformat/aiffdec.c
  3. 2
      libavformat/aiffenc.c
  4. 4
      libavformat/anm.c
  5. 4
      libavformat/ape.c
  6. 2
      libavformat/asfdec.c
  7. 2
      libavformat/asfenc.c
  8. 2
      libavformat/avidec.c
  9. 4
      libavformat/avienc.c
  10. 2
      libavformat/bink.c
  11. 4
      libavformat/c93.c
  12. 2
      libavformat/cafdec.c
  13. 2
      libavformat/crypto.c
  14. 2
      libavformat/dxa.c
  15. 2
      libavformat/eacdata.c
  16. 2
      libavformat/filmstripdec.c
  17. 2
      libavformat/filmstripenc.c
  18. 2
      libavformat/flvdec.c
  19. 4
      libavformat/gif.c
  20. 2
      libavformat/gopher.c
  21. 2
      libavformat/gsmdec.c
  22. 2
      libavformat/http.c
  23. 2
      libavformat/iff.c
  24. 2
      libavformat/img2.c
  25. 2
      libavformat/img2dec.c
  26. 2
      libavformat/img2enc.c
  27. 2
      libavformat/iss.c
  28. 4
      libavformat/jvdec.c
  29. 2
      libavformat/latmenc.c
  30. 2
      libavformat/lxfdec.c
  31. 40
      libavformat/matroskadec.c
  32. 6
      libavformat/matroskaenc.c
  33. 2
      libavformat/mm.c
  34. 2
      libavformat/mmf.c
  35. 2
      libavformat/mmsh.c
  36. 2
      libavformat/mmst.c
  37. 4
      libavformat/mpc.c
  38. 2
      libavformat/mpc8.c
  39. 4
      libavformat/mpegenc.c
  40. 4
      libavformat/mpegts.c
  41. 24
      libavformat/mxfdec.c
  42. 8
      libavformat/mxfenc.c
  43. 2
      libavformat/nsvdec.c
  44. 2
      libavformat/nuv.c
  45. 6
      libavformat/oggenc.c
  46. 2
      libavformat/paf.c
  47. 2
      libavformat/pva.c
  48. 2
      libavformat/qcp.c
  49. 4
      libavformat/r3d.c
  50. 2
      libavformat/rmdec.c
  51. 4
      libavformat/rmenc.c
  52. 2
      libavformat/rtpdec_mpeg4.c
  53. 2
      libavformat/rtpdec_qcelp.c
  54. 2
      libavformat/segafilm.c
  55. 2
      libavformat/segment.c
  56. 2
      libavformat/sierravmd.c
  57. 6
      libavformat/smoothstreamingenc.c
  58. 2
      libavformat/soxenc.c
  59. 2
      libavformat/tls.c
  60. 2
      libavformat/tta.c
  61. 2
      libavformat/tty.c
  62. 2
      libavformat/udp.c
  63. 6
      libavformat/wtv.c
  64. 2
      libavformat/wvdec.c
  65. 2
      libavformat/xwma.c

@ -28,7 +28,7 @@
#define ADTS_HEADER_SIZE 7 #define ADTS_HEADER_SIZE 7
typedef struct { typedef struct ADTSContext {
int write_adts; int write_adts;
int objecttype; int objecttype;
int sample_rate_index; int sample_rate_index;

@ -29,7 +29,7 @@
#define AIFF 0 #define AIFF 0
#define AIFF_C_VERSION1 0xA2805140 #define AIFF_C_VERSION1 0xA2805140
typedef struct { typedef struct AIFFInputContext {
int64_t data_end; int64_t data_end;
int block_duration; int block_duration;
} AIFFInputContext; } AIFFInputContext;

@ -27,7 +27,7 @@
#include "aiff.h" #include "aiff.h"
#include "avio_internal.h" #include "avio_internal.h"
typedef struct { typedef struct AIFFOutputContext {
int64_t form; int64_t form;
int64_t frames; int64_t frames;
int64_t ssnd; int64_t ssnd;

@ -28,13 +28,13 @@
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
typedef struct { typedef struct Page {
int base_record; int base_record;
unsigned int nb_records; unsigned int nb_records;
int size; int size;
} Page; } Page;
typedef struct { typedef struct AnmDemuxContext {
unsigned int nb_pages; /**< total pages in file */ unsigned int nb_pages; /**< total pages in file */
unsigned int nb_records; /**< total records in file */ unsigned int nb_records; /**< total records in file */
int page_table_offset; int page_table_offset;

@ -42,7 +42,7 @@
#define APE_EXTRADATA_SIZE 6 #define APE_EXTRADATA_SIZE 6
typedef struct { typedef struct APEFrame {
int64_t pos; int64_t pos;
int nblocks; int nblocks;
int size; int size;
@ -50,7 +50,7 @@ typedef struct {
int64_t pts; int64_t pts;
} APEFrame; } APEFrame;
typedef struct { typedef struct APEContext {
/* Derived fields */ /* Derived fields */
uint32_t junklength; uint32_t junklength;
uint32_t firstframe; uint32_t firstframe;

@ -39,7 +39,7 @@
#include "asf.h" #include "asf.h"
#include "asfcrypt.h" #include "asfcrypt.h"
typedef struct { typedef struct ASFContext {
const AVClass *class; const AVClass *class;
int asfid2avid[128]; ///< conversion table from asf ID 2 AVStream ID int asfid2avid[128]; ///< conversion table from asf ID 2 AVStream ID
ASFStream streams[128]; ///< it's max number and it's not that big ASFStream streams[128]; ///< it's max number and it's not that big

@ -185,7 +185,7 @@
#define DATA_HEADER_SIZE 50 #define DATA_HEADER_SIZE 50
typedef struct { typedef struct ASFContext {
uint32_t seqno; uint32_t seqno;
int is_streamed; int is_streamed;
ASFStream streams[128]; ///< it's max number and it's not that big ASFStream streams[128]; ///< it's max number and it's not that big

@ -61,7 +61,7 @@ typedef struct AVIStream {
uint8_t *sub_buffer; uint8_t *sub_buffer;
} AVIStream; } AVIStream;
typedef struct { typedef struct AVIContext {
int64_t riff_end; int64_t riff_end;
int64_t movi_end; int64_t movi_end;
int64_t fsize; int64_t fsize;

@ -44,13 +44,13 @@ typedef struct AVIIndex {
AVIIentry** cluster; AVIIentry** cluster;
} AVIIndex; } AVIIndex;
typedef struct { typedef struct AVIContext {
int64_t riff_start, movi_list, odml_list; int64_t riff_start, movi_list, odml_list;
int64_t frames_hdr_all; int64_t frames_hdr_all;
int riff_id; int riff_id;
} AVIContext; } AVIContext;
typedef struct { typedef struct AVIStream {
int64_t frames_hdr_strm; int64_t frames_hdr_strm;
int audio_strm_length; int audio_strm_length;
int packet_count; int packet_count;

@ -46,7 +46,7 @@ enum BinkAudFlags {
#define BINK_MAX_WIDTH 7680 #define BINK_MAX_WIDTH 7680
#define BINK_MAX_HEIGHT 4800 #define BINK_MAX_HEIGHT 4800
typedef struct { typedef struct BinkDemuxContext {
uint32_t file_size; uint32_t file_size;
uint32_t num_audio_tracks; uint32_t num_audio_tracks;

@ -24,13 +24,13 @@
#include "voc.h" #include "voc.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
typedef struct { typedef struct C93BlockRecord {
uint16_t index; uint16_t index;
uint8_t length; uint8_t length;
uint8_t frames; uint8_t frames;
} C93BlockRecord; } C93BlockRecord;
typedef struct { typedef struct C93DemuxContext {
VocDecContext voc; VocDecContext voc;
C93BlockRecord block_records[512]; C93BlockRecord block_records[512];

@ -36,7 +36,7 @@
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "caf.h" #include "caf.h"
typedef struct { typedef struct CafContext {
int bytes_per_packet; ///< bytes in a packet, or 0 if variable int bytes_per_packet; ///< bytes in a packet, or 0 if variable
int frames_per_packet; ///< frames 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 int64_t num_bytes; ///< total number of bytes in stream

@ -29,7 +29,7 @@
#define MAX_BUFFER_BLOCKS 150 #define MAX_BUFFER_BLOCKS 150
#define BLOCKSIZE 16 #define BLOCKSIZE 16
typedef struct { typedef struct CryptoContext {
const AVClass *class; const AVClass *class;
URLContext *hd; URLContext *hd;
uint8_t inbuffer [BLOCKSIZE*MAX_BUFFER_BLOCKS], uint8_t inbuffer [BLOCKSIZE*MAX_BUFFER_BLOCKS],

@ -28,7 +28,7 @@
#define DXA_EXTRA_SIZE 9 #define DXA_EXTRA_SIZE 9
typedef struct{ typedef struct DXAContext {
int frames; int frames;
int has_sound; int has_sound;
int bpc; int bpc;

@ -31,7 +31,7 @@
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
typedef struct { typedef struct CdataDemuxContext {
unsigned int channels; unsigned int channels;
unsigned int audio_pts; unsigned int audio_pts;
} CdataDemuxContext; } CdataDemuxContext;

@ -30,7 +30,7 @@
#define RAND_TAG MKBETAG('R','a','n','d') #define RAND_TAG MKBETAG('R','a','n','d')
typedef struct { typedef struct FilmstripDemuxContext {
int leading; int leading;
} FilmstripDemuxContext; } FilmstripDemuxContext;

@ -29,7 +29,7 @@
#define RAND_TAG MKBETAG('R','a','n','d') #define RAND_TAG MKBETAG('R','a','n','d')
typedef struct { typedef struct FilmstripMuxContext {
int nb_frames; int nb_frames;
} FilmstripMuxContext; } FilmstripMuxContext;

@ -43,7 +43,7 @@
#define VALIDATE_INDEX_TS_THRESH 2500 #define VALIDATE_INDEX_TS_THRESH 2500
typedef struct { typedef struct FLVContext {
const AVClass *class; ///< Class for private options. const AVClass *class; ///< Class for private options.
int trust_metadata; ///< configure streams according onMetaData int trust_metadata; ///< configure streams according onMetaData
int wrong_dts; ///< wrong dts due to negative cts int wrong_dts; ///< wrong dts due to negative cts

@ -58,7 +58,7 @@
* (byte 19) in the app_header */ * (byte 19) in the app_header */
#define GIF_ADD_APP_HEADER // required to enable looping of animated gif #define GIF_ADD_APP_HEADER // required to enable looping of animated gif
typedef struct { typedef struct rgb_triplet {
unsigned char r; unsigned char r;
unsigned char g; unsigned char g;
unsigned char b; unsigned char b;
@ -253,7 +253,7 @@ static int gif_image_write_image(AVIOContext *pb,
return 0; return 0;
} }
typedef struct { typedef struct GIFContext {
AVClass *class; /** Class for private options. */ AVClass *class; /** Class for private options. */
int64_t time, file_time; int64_t time, file_time;
uint8_t buffer[100]; /* data chunks */ uint8_t buffer[100]; /* data chunks */

@ -28,7 +28,7 @@
#include "network.h" #include "network.h"
#include "url.h" #include "url.h"
typedef struct { typedef struct GopherContext {
URLContext *hd; URLContext *hd;
} GopherContext; } GopherContext;

@ -29,7 +29,7 @@
#define GSM_BLOCK_SAMPLES 160 #define GSM_BLOCK_SAMPLES 160
#define GSM_SAMPLE_RATE 8000 #define GSM_SAMPLE_RATE 8000
typedef struct { typedef struct GSMDemuxerContext {
AVClass *class; AVClass *class;
int sample_rate; int sample_rate;
} GSMDemuxerContext; } GSMDemuxerContext;

@ -45,7 +45,7 @@
#define BUFFER_SIZE MAX_URL_SIZE #define BUFFER_SIZE MAX_URL_SIZE
#define MAX_REDIRECTS 8 #define MAX_REDIRECTS 8
typedef struct { typedef struct HTTPContext {
const AVClass *class; const AVClass *class;
URLContext *hd; URLContext *hd;
unsigned char buffer[BUFFER_SIZE], *buf_ptr, *buf_end; unsigned char buffer[BUFFER_SIZE], *buf_ptr, *buf_end;

@ -74,7 +74,7 @@ typedef enum {
BITMAP_BYTERUN1 BITMAP_BYTERUN1
} bitmap_compression_type; } bitmap_compression_type;
typedef struct { typedef struct IffDemuxContext {
uint64_t body_pos; uint64_t body_pos;
uint32_t body_size; uint32_t body_size;
uint32_t sent_bytes; uint32_t sent_bytes;

@ -23,7 +23,7 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "internal.h" #include "internal.h"
typedef struct { typedef struct IdStrMap {
enum AVCodecID id; enum AVCodecID id;
const char *str; const char *str;
} IdStrMap; } IdStrMap;

@ -28,7 +28,7 @@
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
typedef struct { typedef struct VideoDemuxData {
const AVClass *class; /**< Class for private options. */ const AVClass *class; /**< Class for private options. */
int img_first; int img_first;
int img_last; int img_last;

@ -28,7 +28,7 @@
#include "internal.h" #include "internal.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
typedef struct { typedef struct VideoMuxData {
const AVClass *class; /**< Class for private options. */ const AVClass *class; /**< Class for private options. */
int img_number; int img_number;
int is_pipe; int is_pipe;

@ -35,7 +35,7 @@
#define ISS_SIG_LEN 15 #define ISS_SIG_LEN 15
#define MAX_TOKEN_SIZE 20 #define MAX_TOKEN_SIZE 20
typedef struct { typedef struct IssDemuxContext {
int packet_size; int packet_size;
int sample_start_pos; int sample_start_pos;
} IssDemuxContext; } IssDemuxContext;

@ -33,14 +33,14 @@
#define JV_PREAMBLE_SIZE 5 #define JV_PREAMBLE_SIZE 5
typedef struct { typedef struct JVFrame {
int audio_size; /** audio packet size (bytes) */ int audio_size; /** audio packet size (bytes) */
int video_size; /** video packet size (bytes) */ int video_size; /** video packet size (bytes) */
int palette_size; /** palette size (bytes) */ int palette_size; /** palette size (bytes) */
int video_type; /** per-frame video compression type */ int video_type; /** per-frame video compression type */
} JVFrame; } JVFrame;
typedef struct { typedef struct JVDemuxContext {
JVFrame *frames; JVFrame *frames;
enum { enum {
JV_AUDIO = 0, JV_AUDIO = 0,

@ -26,7 +26,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avformat.h" #include "avformat.h"
typedef struct { typedef struct LATMContext {
AVClass *av_class; AVClass *av_class;
int off; int off;
int channel_conf; int channel_conf;

@ -46,7 +46,7 @@ static const AVCodecTag lxf_tags[] = {
{ AV_CODEC_ID_NONE, 0 }, { AV_CODEC_ID_NONE, 0 },
}; };
typedef struct { typedef struct LXFDemuxContext {
int channels; ///< number of audio channels. zero means no audio int channels; ///< number of audio channels. zero means no audio
int frame_number; ///< current video frame int frame_number; ///< current video frame
uint32_t video_format, packet_type, extended_size; uint32_t video_format, packet_type, extended_size;

@ -86,18 +86,18 @@ typedef const struct EbmlSyntax {
} def; } def;
} EbmlSyntax; } EbmlSyntax;
typedef struct { typedef struct EbmlList {
int nb_elem; int nb_elem;
void *elem; void *elem;
} EbmlList; } EbmlList;
typedef struct { typedef struct EbmlBin {
int size; int size;
uint8_t *data; uint8_t *data;
int64_t pos; int64_t pos;
} EbmlBin; } EbmlBin;
typedef struct { typedef struct Ebml {
uint64_t version; uint64_t version;
uint64_t max_size; uint64_t max_size;
uint64_t id_length; uint64_t id_length;
@ -105,18 +105,18 @@ typedef struct {
uint64_t doctype_version; uint64_t doctype_version;
} Ebml; } Ebml;
typedef struct { typedef struct MatroskaTrackCompression {
uint64_t algo; uint64_t algo;
EbmlBin settings; EbmlBin settings;
} MatroskaTrackCompression; } MatroskaTrackCompression;
typedef struct { typedef struct MatroskaTrackEncoding {
uint64_t scope; uint64_t scope;
uint64_t type; uint64_t type;
MatroskaTrackCompression compression; MatroskaTrackCompression compression;
} MatroskaTrackEncoding; } MatroskaTrackEncoding;
typedef struct { typedef struct MatroskaTrackVideo {
double frame_rate; double frame_rate;
uint64_t display_width; uint64_t display_width;
uint64_t display_height; uint64_t display_height;
@ -126,7 +126,7 @@ typedef struct {
uint64_t stereo_mode; uint64_t stereo_mode;
} MatroskaTrackVideo; } MatroskaTrackVideo;
typedef struct { typedef struct MatroskaTrackAudio {
double samplerate; double samplerate;
double out_samplerate; double out_samplerate;
uint64_t bitdepth; uint64_t bitdepth;
@ -143,7 +143,7 @@ typedef struct {
uint8_t *buf; uint8_t *buf;
} MatroskaTrackAudio; } MatroskaTrackAudio;
typedef struct { typedef struct MatroskaTrack {
uint64_t num; uint64_t num;
uint64_t uid; uint64_t uid;
uint64_t type; uint64_t type;
@ -165,7 +165,7 @@ typedef struct {
int ms_compat; int ms_compat;
} MatroskaTrack; } MatroskaTrack;
typedef struct { typedef struct MatroskaAttachment {
uint64_t uid; uint64_t uid;
char *filename; char *filename;
char *mime; char *mime;
@ -174,7 +174,7 @@ typedef struct {
AVStream *stream; AVStream *stream;
} MatroskaAttachment; } MatroskaAttachment;
typedef struct { typedef struct MatroskaChapter {
uint64_t start; uint64_t start;
uint64_t end; uint64_t end;
uint64_t uid; uint64_t uid;
@ -183,17 +183,17 @@ typedef struct {
AVChapter *chapter; AVChapter *chapter;
} MatroskaChapter; } MatroskaChapter;
typedef struct { typedef struct MatroskaIndexPos {
uint64_t track; uint64_t track;
uint64_t pos; uint64_t pos;
} MatroskaIndexPos; } MatroskaIndexPos;
typedef struct { typedef struct MatroskaIndex {
uint64_t time; uint64_t time;
EbmlList pos; EbmlList pos;
} MatroskaIndex; } MatroskaIndex;
typedef struct { typedef struct MatroskaTag {
char *name; char *name;
char *string; char *string;
char *lang; char *lang;
@ -201,7 +201,7 @@ typedef struct {
EbmlList sub; EbmlList sub;
} MatroskaTag; } MatroskaTag;
typedef struct { typedef struct MatroskaTagTarget {
char *type; char *type;
uint64_t typevalue; uint64_t typevalue;
uint64_t trackuid; uint64_t trackuid;
@ -209,27 +209,27 @@ typedef struct {
uint64_t attachuid; uint64_t attachuid;
} MatroskaTagTarget; } MatroskaTagTarget;
typedef struct { typedef struct MatroskaTags {
MatroskaTagTarget target; MatroskaTagTarget target;
EbmlList tag; EbmlList tag;
} MatroskaTags; } MatroskaTags;
typedef struct { typedef struct MatroskaSeekhead {
uint64_t id; uint64_t id;
uint64_t pos; uint64_t pos;
} MatroskaSeekhead; } MatroskaSeekhead;
typedef struct { typedef struct MatroskaLevel {
uint64_t start; uint64_t start;
uint64_t length; uint64_t length;
} MatroskaLevel; } MatroskaLevel;
typedef struct { typedef struct MatroskaCluster {
uint64_t timecode; uint64_t timecode;
EbmlList blocks; EbmlList blocks;
} MatroskaCluster; } MatroskaCluster;
typedef struct { typedef struct MatroskaDemuxContext {
AVFormatContext *ctx; AVFormatContext *ctx;
/* EBML stuff */ /* EBML stuff */
@ -273,7 +273,7 @@ typedef struct {
int contains_ssa; int contains_ssa;
} MatroskaDemuxContext; } MatroskaDemuxContext;
typedef struct { typedef struct MatroskaBlock {
uint64_t duration; uint64_t duration;
int64_t reference; int64_t reference;
uint64_t non_simple; uint64_t non_simple;

@ -67,19 +67,19 @@ typedef struct mkv_seekhead {
int num_entries; int num_entries;
} mkv_seekhead; } mkv_seekhead;
typedef struct { typedef struct mkv_cuepoint {
uint64_t pts; uint64_t pts;
int tracknum; int tracknum;
int64_t cluster_pos; ///< file offset of the cluster containing the block int64_t cluster_pos; ///< file offset of the cluster containing the block
} mkv_cuepoint; } mkv_cuepoint;
typedef struct { typedef struct mkv_cues {
int64_t segment_offset; int64_t segment_offset;
mkv_cuepoint *entries; mkv_cuepoint *entries;
int num_entries; int num_entries;
} mkv_cues; } mkv_cues;
typedef struct { typedef struct mkv_track {
int write_dts; int write_dts;
int64_t ts_offset; int64_t ts_offset;
} mkv_track; } mkv_track;

@ -54,7 +54,7 @@
#define MM_PALETTE_COUNT 128 #define MM_PALETTE_COUNT 128
#define MM_PALETTE_SIZE (MM_PALETTE_COUNT*3) #define MM_PALETTE_SIZE (MM_PALETTE_COUNT*3)
typedef struct { typedef struct MmDemuxContext {
unsigned int audio_pts, video_pts; unsigned int audio_pts, video_pts;
} MmDemuxContext; } MmDemuxContext;

@ -26,7 +26,7 @@
#include "pcm.h" #include "pcm.h"
#include "riff.h" #include "riff.h"
typedef struct { typedef struct MMFContext {
int64_t atrpos, atsqpos, awapos; int64_t atrpos, atsqpos, awapos;
int64_t data_size; int64_t data_size;
} MMFContext; } MMFContext;

@ -54,7 +54,7 @@ typedef enum {
CHUNK_TYPE_STREAM_CHANGE = 0x4324, CHUNK_TYPE_STREAM_CHANGE = 0x4324,
} ChunkType; } ChunkType;
typedef struct { typedef struct MMSHContext {
MMSContext mms; MMSContext mms;
int request_seq; ///< request packet sequence int request_seq; ///< request packet sequence
int chunk_seq; ///< data packet sequence int chunk_seq; ///< data packet sequence

@ -85,7 +85,7 @@ typedef enum {
/*@}*/ /*@}*/
} MMSSCPacketType; } MMSSCPacketType;
typedef struct { typedef struct MMSTContext {
MMSContext mms; MMSContext mms;
int outgoing_packet_seq; ///< Outgoing packet sequence number. int outgoing_packet_seq; ///< Outgoing packet sequence number.
char path[256]; ///< Path of the resource being asked for. char path[256]; ///< Path of the resource being asked for.

@ -31,12 +31,12 @@
#define DELAY_FRAMES 32 #define DELAY_FRAMES 32
static const int mpc_rate[4] = { 44100, 48000, 37800, 32000 }; static const int mpc_rate[4] = { 44100, 48000, 37800, 32000 };
typedef struct { typedef struct MPCFrame {
int64_t pos; int64_t pos;
int size, skip; int size, skip;
}MPCFrame; }MPCFrame;
typedef struct { typedef struct MPCContext {
int ver; int ver;
uint32_t curframe, lastframe; uint32_t curframe, lastframe;
uint32_t fcount; uint32_t fcount;

@ -47,7 +47,7 @@ enum MPCPacketTags{
static const int mpc8_rate[8] = { 44100, 48000, 37800, 32000, -1, -1, -1, -1 }; static const int mpc8_rate[8] = { 44100, 48000, 37800, 32000, -1, -1, -1, -1 };
typedef struct { typedef struct MPCContext {
int ver; int ver;
int64_t header_pos; int64_t header_pos;
int64_t samples; int64_t samples;

@ -46,7 +46,7 @@ typedef struct PacketDesc {
struct PacketDesc *next; struct PacketDesc *next;
} PacketDesc; } PacketDesc;
typedef struct { typedef struct StreamInfo {
AVFifoBuffer *fifo; AVFifoBuffer *fifo;
uint8_t id; uint8_t id;
int max_buffer_size; /* in bytes */ int max_buffer_size; /* in bytes */
@ -62,7 +62,7 @@ typedef struct {
int64_t vobu_start_pts; int64_t vobu_start_pts;
} StreamInfo; } StreamInfo;
typedef struct { typedef struct MpegMuxContext {
const AVClass *class; const AVClass *class;
int packet_size; /* required packet size */ int packet_size; /* required packet size */
int packet_number; int packet_number;

@ -565,7 +565,7 @@ static int parse_section_header(SectionHeader *h,
return 0; return 0;
} }
typedef struct { typedef struct StreamType {
uint32_t stream_type; uint32_t stream_type;
enum AVMediaType codec_type; enum AVMediaType codec_type;
enum AVCodecID codec_id; enum AVCodecID codec_id;
@ -1026,7 +1026,7 @@ static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid)
} }
#define MAX_LEVEL 4 #define MAX_LEVEL 4
typedef struct { typedef struct MP4DescrParseContext {
AVFormatContext *s; AVFormatContext *s;
AVIOContext pb; AVIOContext pb;
Mp4Descr *descr; Mp4Descr *descr;

@ -72,7 +72,7 @@ typedef enum {
OPSonyOpt, /* FATE sample, violates the spec in places */ OPSonyOpt, /* FATE sample, violates the spec in places */
} MXFOP; } MXFOP;
typedef struct { typedef struct MXFPartition {
int closed; int closed;
int complete; int complete;
MXFPartitionType type; MXFPartitionType type;
@ -88,13 +88,13 @@ typedef struct {
int pack_length; int pack_length;
} MXFPartition; } MXFPartition;
typedef struct { typedef struct MXFCryptoContext {
UID uid; UID uid;
enum MXFMetadataSetType type; enum MXFMetadataSetType type;
UID source_container_ul; UID source_container_ul;
} MXFCryptoContext; } MXFCryptoContext;
typedef struct { typedef struct MXFStructuralComponent {
UID uid; UID uid;
enum MXFMetadataSetType type; enum MXFMetadataSetType type;
UID source_package_uid; UID source_package_uid;
@ -104,7 +104,7 @@ typedef struct {
int source_track_id; int source_track_id;
} MXFStructuralComponent; } MXFStructuralComponent;
typedef struct { typedef struct MXFSequence {
UID uid; UID uid;
enum MXFMetadataSetType type; enum MXFMetadataSetType type;
UID data_definition_ul; UID data_definition_ul;
@ -114,7 +114,7 @@ typedef struct {
uint8_t origin; uint8_t origin;
} MXFSequence; } MXFSequence;
typedef struct { typedef struct MXFTrack {
UID uid; UID uid;
enum MXFMetadataSetType type; enum MXFMetadataSetType type;
MXFSequence *sequence; /* mandatory, and only one */ MXFSequence *sequence; /* mandatory, and only one */
@ -127,7 +127,7 @@ typedef struct {
int64_t original_duration; /* st->duration in SampleRate/EditRate units */ int64_t original_duration; /* st->duration in SampleRate/EditRate units */
} MXFTrack; } MXFTrack;
typedef struct { typedef struct MXFDescriptor {
UID uid; UID uid;
enum MXFMetadataSetType type; enum MXFMetadataSetType type;
UID essence_container_ul; UID essence_container_ul;
@ -153,7 +153,7 @@ typedef struct {
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;
} MXFDescriptor; } MXFDescriptor;
typedef struct { typedef struct MXFIndexTableSegment {
UID uid; UID uid;
enum MXFMetadataSetType type; enum MXFMetadataSetType type;
int edit_unit_byte_count; int edit_unit_byte_count;
@ -168,7 +168,7 @@ typedef struct {
int nb_index_entries; int nb_index_entries;
} MXFIndexTableSegment; } MXFIndexTableSegment;
typedef struct { typedef struct MXFPackage {
UID uid; UID uid;
enum MXFMetadataSetType type; enum MXFMetadataSetType type;
UID package_uid; UID package_uid;
@ -178,13 +178,13 @@ typedef struct {
UID descriptor_ref; UID descriptor_ref;
} MXFPackage; } MXFPackage;
typedef struct { typedef struct MXFMetadataSet {
UID uid; UID uid;
enum MXFMetadataSetType type; enum MXFMetadataSetType type;
} MXFMetadataSet; } MXFMetadataSet;
/* decoded index table */ /* decoded index table */
typedef struct { typedef struct MXFIndexTable {
int index_sid; int index_sid;
int body_sid; int body_sid;
int nb_ptses; /* number of PTSes or total duration of index */ 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() */ AVIndexEntry *fake_index; /* used for calling ff_index_search_timestamp() */
} MXFIndexTable; } MXFIndexTable;
typedef struct { typedef struct MXFContext {
MXFPartition *partitions; MXFPartition *partitions;
unsigned partitions_count; unsigned partitions_count;
MXFOP op; MXFOP op;
@ -230,7 +230,7 @@ enum MXFWrappingScheme {
/* NOTE: klv_offset is not set (-1) for local keys */ /* 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 int MXFMetadataReadFunc(void *arg, AVIOContext *pb, int tag, int size, UID uid, int64_t klv_offset);
typedef struct { typedef struct MXFMetadataReadTableEntry {
const UID key; const UID key;
MXFMetadataReadFunc *read; MXFMetadataReadFunc *read;
int ctx_size; int ctx_size;

@ -50,19 +50,19 @@ extern AVOutputFormat ff_mxf_d10_muxer;
#define EDIT_UNITS_PER_BODY 250 #define EDIT_UNITS_PER_BODY 250
#define KAG_SIZE 512 #define KAG_SIZE 512
typedef struct { typedef struct MXFLocalTagPair {
int local_tag; int local_tag;
UID uid; UID uid;
} MXFLocalTagPair; } MXFLocalTagPair;
typedef struct { typedef struct MXFIndexEntry {
uint8_t flags; uint8_t flags;
uint64_t offset; uint64_t offset;
unsigned slice_offset; ///< offset of audio slice unsigned slice_offset; ///< offset of audio slice
uint16_t temporal_ref; uint16_t temporal_ref;
} MXFIndexEntry; } MXFIndexEntry;
typedef struct { typedef struct MXFStreamContext {
AudioInterleaveContext aic; AudioInterleaveContext aic;
UID track_essence_element_key; UID track_essence_element_key;
int index; ///< index in mxf_essence_container_uls table 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 int closed_gop; ///< gop is closed, used in mpeg-2 frame parsing
} MXFStreamContext; } MXFStreamContext;
typedef struct { typedef struct MXFContainerEssenceEntry {
UID container_ul; UID container_ul;
UID element_ul; UID element_ul;
UID codec_ul; UID codec_ul;

@ -165,7 +165,7 @@ typedef struct NSVStream {
int cum_len; /* temporary storage (used during seek) */ int cum_len; /* temporary storage (used during seek) */
} NSVStream; } NSVStream;
typedef struct { typedef struct NSVContext {
int base_offset; int base_offset;
int NSVf_end; int NSVf_end;
uint32_t *nsvs_file_offset; uint32_t *nsvs_file_offset;

@ -33,7 +33,7 @@ static const AVCodecTag nuv_audio_tags[] = {
{ AV_CODEC_ID_NONE, 0 }, { AV_CODEC_ID_NONE, 0 },
}; };
typedef struct { typedef struct NUVContext {
int v_id; int v_id;
int a_id; int a_id;
int rtjpg_video; int rtjpg_video;

@ -35,7 +35,7 @@
#define MAX_PAGE_SIZE 65025 #define MAX_PAGE_SIZE 65025
typedef struct { typedef struct OGGPage {
int64_t start_granule; int64_t start_granule;
int64_t granule; int64_t granule;
int stream_index; int stream_index;
@ -46,7 +46,7 @@ typedef struct {
uint16_t size; uint16_t size;
} OGGPage; } OGGPage;
typedef struct { typedef struct OGGStreamContext {
unsigned page_counter; unsigned page_counter;
uint8_t *header[3]; uint8_t *header[3];
int header_len[3]; int header_len[3];
@ -66,7 +66,7 @@ typedef struct OGGPageList {
struct OGGPageList *next; struct OGGPageList *next;
} OGGPageList; } OGGPageList;
typedef struct { typedef struct OGGContext {
const AVClass *class; const AVClass *class;
OGGPageList *page_list; OGGPageList *page_list;
int pref_size; ///< preferred page size (0 => fill all segments) int pref_size; ///< preferred page size (0 => fill all segments)

@ -28,7 +28,7 @@
#define PAF_SOUND_SAMPLES 2205 #define PAF_SOUND_SAMPLES 2205
#define PAF_SOUND_FRAME_SIZE ((256 + PAF_SOUND_SAMPLES) * 2) #define PAF_SOUND_FRAME_SIZE ((256 + PAF_SOUND_SAMPLES) * 2)
typedef struct { typedef struct PAFDemuxContext {
uint32_t buffer_size; uint32_t buffer_size;
uint32_t frame_blks; uint32_t frame_blks;
uint32_t nb_frames; uint32_t nb_frames;

@ -28,7 +28,7 @@
#define PVA_AUDIO_PAYLOAD 0x02 #define PVA_AUDIO_PAYLOAD 0x02
#define PVA_MAGIC (('A' << 8) + 'V') #define PVA_MAGIC (('A' << 8) + 'V')
typedef struct { typedef struct PVAContext {
int continue_pes; int continue_pes;
} PVAContext; } PVAContext;

@ -31,7 +31,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
typedef struct { typedef struct QCPContext {
uint32_t data_size; ///< size of data chunk uint32_t data_size; ///< size of data chunk
#define QCP_MAX_MODE 4 #define QCP_MAX_MODE 4

@ -25,13 +25,13 @@
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
typedef struct { typedef struct R3DContext {
unsigned video_offsets_count; unsigned video_offsets_count;
unsigned *video_offsets; unsigned *video_offsets;
unsigned rdvo_offset; unsigned rdvo_offset;
} R3DContext; } R3DContext;
typedef struct { typedef struct Atom {
unsigned size; unsigned size;
uint32_t tag; uint32_t tag;
uint64_t offset; uint64_t offset;

@ -54,7 +54,7 @@ struct RMStream {
int32_t deint_id; ///< deinterleaver used in audio stream int32_t deint_id; ///< deinterleaver used in audio stream
}; };
typedef struct { typedef struct RMDemuxContext {
int nb_packets; int nb_packets;
int old_format; int old_format;
int current_stream; int current_stream;

@ -23,7 +23,7 @@
#include "rm.h" #include "rm.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
typedef struct { typedef struct StreamInfo {
int nb_packets; int nb_packets;
int packet_total_size; int packet_total_size;
int packet_max_size; int packet_max_size;
@ -36,7 +36,7 @@ typedef struct {
AVCodecContext *enc; AVCodecContext *enc;
} StreamInfo; } StreamInfo;
typedef struct { typedef struct RMMuxContext {
StreamInfo streams[2]; StreamInfo streams[2];
StreamInfo *audio_stream, *video_stream; StreamInfo *audio_stream, *video_stream;
int data_pos; /* position of the data after the header */ int data_pos; /* position of the data after the header */

@ -63,7 +63,7 @@ struct PayloadContext {
int buf_pos, buf_size; int buf_pos, buf_size;
}; };
typedef struct { typedef struct AttrNameMap {
const char *str; const char *str;
uint16_t type; uint16_t type;
uint32_t offset; uint32_t offset;

@ -25,7 +25,7 @@ static const uint8_t frame_sizes[] = {
1, 4, 8, 17, 35 1, 4, 8, 17, 35
}; };
typedef struct { typedef struct InterleavePacket {
int pos; int pos;
int size; int size;
/* The largest frame is 35 bytes, only 10 frames are allowed per /* The largest frame is 35 bytes, only 10 frames are allowed per

@ -37,7 +37,7 @@
#define CVID_TAG MKBETAG('c', 'v', 'i', 'd') #define CVID_TAG MKBETAG('c', 'v', 'i', 'd')
#define RAW_TAG MKBETAG('r', 'a', 'w', ' ') #define RAW_TAG MKBETAG('r', 'a', 'w', ' ')
typedef struct { typedef struct film_sample {
int stream; int stream;
int64_t sample_offset; int64_t sample_offset;
unsigned int sample_size; unsigned int sample_size;

@ -30,7 +30,7 @@
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
typedef struct { typedef struct SegmentContext {
const AVClass *class; /**< Class for private options. */ const AVClass *class; /**< Class for private options. */
int number; int number;
AVOutputFormat *oformat; AVOutputFormat *oformat;

@ -35,7 +35,7 @@
#define VMD_HEADER_SIZE 0x0330 #define VMD_HEADER_SIZE 0x0330
#define BYTES_PER_FRAME_RECORD 16 #define BYTES_PER_FRAME_RECORD 16
typedef struct { typedef struct vmd_frame {
int stream_index; int stream_index;
int64_t frame_offset; int64_t frame_offset;
unsigned int frame_size; unsigned int frame_size;

@ -38,7 +38,7 @@
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
typedef struct { typedef struct Fragment {
char file[1024]; char file[1024];
char infofile[1024]; char infofile[1024];
int64_t start_time, duration; int64_t start_time, duration;
@ -46,7 +46,7 @@ typedef struct {
int64_t start_pos, size; int64_t start_pos, size;
} Fragment; } Fragment;
typedef struct { typedef struct OutputStream {
AVFormatContext *ctx; AVFormatContext *ctx;
int ctx_inited; int ctx_inited;
char dirname[1024]; char dirname[1024];
@ -66,7 +66,7 @@ typedef struct {
int audio_tag; int audio_tag;
} OutputStream; } OutputStream;
typedef struct { typedef struct SmoothStreamingContext {
const AVClass *class; /* Class for private options. */ const AVClass *class; /* Class for private options. */
int window_size; int window_size;
int extra_window_size; int extra_window_size;

@ -36,7 +36,7 @@
#include "avio_internal.h" #include "avio_internal.h"
#include "sox.h" #include "sox.h"
typedef struct { typedef struct SoXContext {
int64_t header_size; int64_t header_size;
} SoXContext; } SoXContext;

@ -57,7 +57,7 @@
#include <poll.h> #include <poll.h>
#endif #endif
typedef struct { typedef struct TLSContext {
const AVClass *class; const AVClass *class;
URLContext *tcp; URLContext *tcp;
#if CONFIG_GNUTLS #if CONFIG_GNUTLS

@ -25,7 +25,7 @@
#include "id3v1.h" #include "id3v1.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
typedef struct { typedef struct TTAContext {
int totalframes, currentframe; int totalframes, currentframe;
int frame_size; int frame_size;
int last_frame_size; int last_frame_size;

@ -34,7 +34,7 @@
#include "internal.h" #include "internal.h"
#include "sauce.h" #include "sauce.h"
typedef struct { typedef struct TtyDemuxContext {
AVClass *class; AVClass *class;
int chars_per_frame; int chars_per_frame;
uint64_t fsize; /**< file size less metadata buffer */ uint64_t fsize; /**< file size less metadata buffer */

@ -40,7 +40,7 @@
#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
#endif #endif
typedef struct { typedef struct UDPContext {
int udp_fd; int udp_fd;
int ttl; int ttl;
int buffer_size; int buffer_size;

@ -57,7 +57,7 @@
#define SHIFT_SECTOR_BITS(a) ((int64_t)(a) << WTV_SECTOR_BITS) #define SHIFT_SECTOR_BITS(a) ((int64_t)(a) << WTV_SECTOR_BITS)
typedef struct { typedef struct WtvFile {
AVIOContext *pb_filesystem; /** file system (AVFormatContext->pb) */ AVIOContext *pb_filesystem; /** file system (AVFormatContext->pb) */
int sector_bits; /** sector shift bits; used to convert sector number into pb_filesystem offset */ 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; int seen_data;
} WtvStream; } WtvStream;
typedef struct { typedef struct WtvContext {
AVIOContext *pb; /** timeline file */ AVIOContext *pb; /** timeline file */
int64_t epoch; int64_t epoch;
int64_t pts; /** pts for next data chunk */ int64_t pts; /** pts for next data chunk */

@ -47,7 +47,7 @@ static const int wv_rates[16] = {
32000, 44100, 48000, 64000, 88200, 96000, 192000, -1 32000, 44100, 48000, 64000, 88200, 96000, 192000, -1
}; };
typedef struct { typedef struct WVContext {
uint8_t block_header[WV_HEADER_SIZE]; uint8_t block_header[WV_HEADER_SIZE];
WvHeader header; WvHeader header;
int rate, chan, bpp; int rate, chan, bpp;

@ -30,7 +30,7 @@
* Demuxer for xWMA, a Microsoft audio container used by XAudio 2. * Demuxer for xWMA, a Microsoft audio container used by XAudio 2.
*/ */
typedef struct { typedef struct XWMAContext {
int64_t data_end; int64_t data_end;
} XWMAContext; } XWMAContext;

Loading…
Cancel
Save