diff options
author | Måns Rullgård <mans@mansr.com> | 2008-11-06 04:50:56 +0300 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2008-11-06 04:50:56 +0300 |
commit | 77be08eeb199c8f3f78b3426e970decadbc1425c (patch) | |
tree | 073686d98fcc367d45b8285adc4bd4d24125b703 /libavformat/oggparsetheora.c | |
parent | d00e8b83f10cfa0d7e7b1d89a03f092f019322c3 (diff) |
OGG: untypedef demuxer structs
Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/oggparsetheora.c')
-rw-r--r-- | libavformat/oggparsetheora.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c index 851f0e3909..c835fadf6b 100644 --- a/libavformat/oggparsetheora.c +++ b/libavformat/oggparsetheora.c @@ -28,18 +28,18 @@ #include "avformat.h" #include "oggdec.h" -typedef struct theora_params { +struct theora_params { int gpshift; int gpmask; -} theora_params_t; +}; static int theora_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]; - theora_params_t *thp = os->private; + struct theora_params *thp = os->private; int cds = st->codec->extradata_size + os->psize + 2; uint8_t *cdp; @@ -119,9 +119,9 @@ theora_header (AVFormatContext * s, int idx) static uint64_t theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp) { - ogg_t *ogg = ctx->priv_data; - ogg_stream_t *os = ogg->streams + idx; - theora_params_t *thp = os->private; + struct ogg *ogg = ctx->priv_data; + struct ogg_stream *os = ogg->streams + idx; + struct theora_params *thp = os->private; uint64_t iframe = gp >> thp->gpshift; uint64_t pframe = gp & thp->gpmask; @@ -131,7 +131,7 @@ theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp) return iframe + pframe; } -const ogg_codec_t ff_theora_codec = { +const struct ogg_codec ff_theora_codec = { .magic = "\200theora", .magicsize = 7, .header = theora_header, |