Mercurial > libavformat.hg
diff oggparsevorbis.c @ 4016:6cd006bc2de9 libavformat
OGG: untypedef demuxer structs
author | mru |
---|---|
date | Thu, 06 Nov 2008 01:50:56 +0000 |
parents | 6c71b789c69e |
children | dcdf236c9909 |
line wrap: on
line diff
--- a/oggparsevorbis.c Wed Nov 05 09:22:13 2008 +0000 +++ b/oggparsevorbis.c Thu Nov 06 01:50:56 2008 +0000 @@ -122,14 +122,14 @@ * [framing_flag] = read one bit | Not Used * */ -typedef struct { +struct oggvorbis_private { unsigned int len[3]; unsigned char *packet[3]; -} oggvorbis_private_t; +}; static unsigned int -fixup_vorbis_headers(AVFormatContext * as, oggvorbis_private_t *priv, +fixup_vorbis_headers(AVFormatContext * as, struct oggvorbis_private *priv, uint8_t **buf) { int i,offset, len; @@ -154,16 +154,16 @@ static int vorbis_header (AVFormatContext * s, int idx) { - ogg_t *ogg = s->priv_data; - ogg_stream_t *os = ogg->streams + idx; + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + idx; AVStream *st = s->streams[idx]; - oggvorbis_private_t *priv; + struct oggvorbis_private *priv; if (os->seq > 2) return 0; if (os->seq == 0) { - os->private = av_mallocz(sizeof(oggvorbis_private_t)); + os->private = av_mallocz(sizeof(struct oggvorbis_private)); if (!os->private) return 0; } @@ -219,7 +219,7 @@ return os->seq < 3; } -const ogg_codec_t ff_vorbis_codec = { +const struct ogg_codec ff_vorbis_codec = { .magic = "\001vorbis", .magicsize = 7, .header = vorbis_header