diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-11-06 01:50:56 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-11-06 01:50:56 +0000 |
| commit | 77be08eeb199c8f3f78b3426e970decadbc1425c (patch) | |
| tree | 073686d98fcc367d45b8285adc4bd4d24125b703 /libavformat/oggparseogm.c | |
| parent | d00e8b83f10cfa0d7e7b1d89a03f092f019322c3 (diff) | |
OGG: untypedef demuxer structs
Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/oggparseogm.c')
| -rw-r--r-- | libavformat/oggparseogm.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index 6a80dc307a..2cdaac7ec9 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -33,8 +33,8 @@ static int ogm_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]; const uint8_t *p = os->buf + os->pstart; uint64_t time_unit; @@ -100,8 +100,8 @@ ogm_header(AVFormatContext *s, int idx) static int ogm_dshow_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]; uint8_t *p = os->buf + os->pstart; uint32_t t; @@ -134,8 +134,8 @@ ogm_dshow_header(AVFormatContext *s, int idx) static int ogm_packet(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; uint8_t *p = os->buf + os->pstart; int lb; @@ -149,28 +149,28 @@ ogm_packet(AVFormatContext *s, int idx) return 0; } -const ogg_codec_t ff_ogm_video_codec = { +const struct ogg_codec ff_ogm_video_codec = { .magic = "\001video", .magicsize = 6, .header = ogm_header, .packet = ogm_packet }; -const ogg_codec_t ff_ogm_audio_codec = { +const struct ogg_codec ff_ogm_audio_codec = { .magic = "\001audio", .magicsize = 6, .header = ogm_header, .packet = ogm_packet }; -const ogg_codec_t ff_ogm_text_codec = { +const struct ogg_codec ff_ogm_text_codec = { .magic = "\001text", .magicsize = 5, .header = ogm_header, .packet = ogm_packet }; -const ogg_codec_t ff_ogm_old_codec = { +const struct ogg_codec ff_ogm_old_codec = { .magic = "\001Direct Show Samples embedded in Ogg", .magicsize = 35, .header = ogm_dshow_header, |