add png fourcc

[ffmpeg] / libavformat / ogg2.h

diff --git a/libavformat/ogg2.h b/libavformat/ogg2.h
index 9c360de1e2db50c27cdaf35871d9501d53ebe2c8..6b7c6b22ec75052739ece58bc734c5d4e95252f6 100644 (file)
--- a/libavformat/ogg2.h
+++ b/libavformat/ogg2.h
@@ -28,7 +28,7 @@
 #include "avformat.h"
 
 typedef struct ogg_codec {
-    uint8_t *magic;
+    int8_t *magic;
     uint8_t magicsize;
     int8_t *name;
     int (*header)(AVFormatContext *, int);
@@ -57,6 +57,7 @@ typedef struct ogg_state {
     uint64_t pos;
     int curidx;
     struct ogg_state *next;
+    int nstreams;
     ogg_stream_t streams[1];
 } ogg_state_t;
 
@@ -76,12 +77,10 @@ typedef struct ogg {
 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;
-#endif
 
-extern int vorbis_comment(AVFormatContext *ms, char *buf, int size);
+extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
 #endif