FreeBSD ipv6 multicast patch from ports tree

[ffmpeg] / libavformat / ogg2.h

diff --git a/libavformat/ogg2.h b/libavformat/ogg2.h
index b1146e314cd8cad4cba21695346ee4dbe75b1989..9c360de1e2db50c27cdaf35871d9501d53ebe2c8 100644 (file)
--- a/libavformat/ogg2.h
+++ b/libavformat/ogg2.h
@@ -33,6 +33,7 @@ typedef struct ogg_codec {
     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 {
@@ -49,13 +50,14 @@ typedef struct ogg_stream {
     int header;
     int nsegs, segp;
     uint8_t segments[255];
+    void *private;
 } ogg_stream_t;
 
 typedef struct ogg_state {
     uint64_t pos;
     int curidx;
     struct ogg_state *next;
-    ogg_stream_t streams[];
+    ogg_stream_t streams[1];
 } ogg_state_t;
 
 typedef struct ogg {
@@ -72,11 +74,12 @@ typedef struct ogg {
 #define OGG_FLAG_EOS  4
 
 extern ogg_codec_t vorbis_codec;
+extern ogg_codec_t theora_codec;
+extern ogg_codec_t flac_codec;
 #if 0
 extern ogg_codec_t ogm_video_codec;
 extern ogg_codec_t ogm_audio_codec;
 extern ogg_codec_t ogm_old_codec;
-extern ogg_codec_t flac_codec;
 #endif
 
 extern int vorbis_comment(AVFormatContext *ms, char *buf, int size);