diff oggparseogm.c @ 4016:6cd006bc2de9 libavformat

OGG: untypedef demuxer structs
author mru
date Thu, 06 Nov 2008 01:50:56 +0000
parents 6c71b789c69e
children 304a0ea063f0
line wrap: on
line diff
--- a/oggparseogm.c	Wed Nov 05 09:22:13 2008 +0000
+++ b/oggparseogm.c	Thu Nov 06 01:50:56 2008 +0000
@@ -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 @@
 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 @@
 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 @@
     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,