OGG: untypedef demuxer structs

Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2008-11-06 01:50:56 +00:00
parent d00e8b83f1
commit 77be08eeb1
7 changed files with 83 additions and 83 deletions

View File

@@ -27,16 +27,16 @@
#include "avformat.h"
typedef struct ogg_codec {
struct ogg_codec {
const int8_t *magic;
uint8_t magicsize;
const int8_t *name;
int (*header)(AVFormatContext *, int);
int (*packet)(AVFormatContext *, int);
uint64_t (*gptopts)(AVFormatContext *, int, uint64_t);
} ogg_codec_t;
};
typedef struct ogg_stream {
struct ogg_stream {
uint8_t *buf;
unsigned int bufsize;
unsigned int bufpos;
@@ -47,43 +47,43 @@ typedef struct ogg_stream {
uint32_t seq;
uint64_t granule, lastgp;
int flags;
ogg_codec_t *codec;
struct ogg_codec *codec;
int header;
int nsegs, segp;
uint8_t segments[255];
void *private;
} ogg_stream_t;
};
typedef struct ogg_state {
struct ogg_state {
uint64_t pos;
int curidx;
struct ogg_state *next;
int nstreams;
ogg_stream_t streams[1];
} ogg_state_t;
struct ogg_stream streams[1];
};
typedef struct ogg {
ogg_stream_t *streams;
struct ogg {
struct ogg_stream *streams;
int nstreams;
int headers;
int curidx;
uint64_t size;
ogg_state_t *state;
} ogg_t;
struct ogg_state *state;
};
#define OGG_FLAG_CONT 1
#define OGG_FLAG_BOS 2
#define OGG_FLAG_EOS 4
extern const ogg_codec_t ff_flac_codec;
extern const ogg_codec_t ff_ogm_audio_codec;
extern const ogg_codec_t ff_ogm_old_codec;
extern const ogg_codec_t ff_ogm_text_codec;
extern const ogg_codec_t ff_ogm_video_codec;
extern const ogg_codec_t ff_old_flac_codec;
extern const ogg_codec_t ff_speex_codec;
extern const ogg_codec_t ff_theora_codec;
extern const ogg_codec_t ff_vorbis_codec;
extern const struct ogg_codec ff_flac_codec;
extern const struct ogg_codec ff_ogm_audio_codec;
extern const struct ogg_codec ff_ogm_old_codec;
extern const struct ogg_codec ff_ogm_text_codec;
extern const struct ogg_codec ff_ogm_video_codec;
extern const struct ogg_codec ff_old_flac_codec;
extern const struct ogg_codec ff_speex_codec;
extern const struct ogg_codec ff_theora_codec;
extern const struct ogg_codec ff_vorbis_codec;
extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);