[FFmpeg-cvslog] r14948 - in trunk/libavformat: oggdec.c oggdec.h oggparseflac.c oggparseogm.c oggparsespeex.c oggparsetheora.c oggparsevorbis.c

[reimar]

Author: reimar
Date: Sun Aug 24 19:09:15 2008
New Revision: 14948

Log:
Make ogg_codec_t descriptions const

Modified:
   trunk/libavformat/oggdec.c
   trunk/libavformat/oggdec.h
   trunk/libavformat/oggparseflac.c
   trunk/libavformat/oggparseogm.c
   trunk/libavformat/oggparsespeex.c
   trunk/libavformat/oggparsetheora.c
   trunk/libavformat/oggparsevorbis.c

Modified: trunk/libavformat/oggdec.c
==============================================================================
--- trunk/libavformat/oggdec.c	(original)
+++ trunk/libavformat/oggdec.c	Sun Aug 24 19:09:15 2008
@@ -37,7 +37,7 @@
 #define MAX_PAGE_SIZE 65307
 #define DECODER_BUFFER_SIZE MAX_PAGE_SIZE
 
-static ogg_codec_t *ogg_codecs[] = {
+static const ogg_codec_t * const ogg_codecs[] = {
     &speex_codec,
     &vorbis_codec,
     &theora_codec,
@@ -126,7 +126,7 @@ ogg_reset (ogg_t * ogg)
     return 0;
 }
 
-static ogg_codec_t *
+static const ogg_codec_t *
 ogg_find_codec (uint8_t * buf, int size)
 {
     int i;

Modified: trunk/libavformat/oggdec.h
==============================================================================
--- trunk/libavformat/oggdec.h	(original)
+++ trunk/libavformat/oggdec.h	Sun Aug 24 19:09:15 2008
@@ -75,15 +75,15 @@ typedef struct ogg {
 #define OGG_FLAG_BOS  2
 #define OGG_FLAG_EOS  4
 
-extern ogg_codec_t flac_codec;
-extern ogg_codec_t ogm_audio_codec;
-extern ogg_codec_t ogm_old_codec;
-extern ogg_codec_t ogm_text_codec;
-extern ogg_codec_t ogm_video_codec;
-extern ogg_codec_t old_flac_codec;
-extern ogg_codec_t speex_codec;
-extern ogg_codec_t theora_codec;
-extern ogg_codec_t vorbis_codec;
+extern const ogg_codec_t flac_codec;
+extern const ogg_codec_t ogm_audio_codec;
+extern const ogg_codec_t ogm_old_codec;
+extern const ogg_codec_t ogm_text_codec;
+extern const ogg_codec_t ogm_video_codec;
+extern const ogg_codec_t old_flac_codec;
+extern const ogg_codec_t speex_codec;
+extern const ogg_codec_t theora_codec;
+extern const ogg_codec_t vorbis_codec;
 
 extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 

Modified: trunk/libavformat/oggparseflac.c
==============================================================================
--- trunk/libavformat/oggparseflac.c	(original)
+++ trunk/libavformat/oggparseflac.c	Sun Aug 24 19:09:15 2008
@@ -85,13 +85,13 @@ old_flac_header (AVFormatContext * s, in
     return 0;
 }
 
-ogg_codec_t flac_codec = {
+const ogg_codec_t flac_codec = {
     .magic = "\177FLAC",
     .magicsize = 5,
     .header = flac_header
 };
 
-ogg_codec_t old_flac_codec = {
+const ogg_codec_t old_flac_codec = {
     .magic = "fLaC",
     .magicsize = 4,
     .header = old_flac_header

Modified: trunk/libavformat/oggparseogm.c
==============================================================================
--- trunk/libavformat/oggparseogm.c	(original)
+++ trunk/libavformat/oggparseogm.c	Sun Aug 24 19:09:15 2008
@@ -149,28 +149,28 @@ ogm_packet(AVFormatContext *s, int idx)
     return 0;
 }
 
-ogg_codec_t ogm_video_codec = {
+const ogg_codec_t ogm_video_codec = {
     .magic = "\001video",
     .magicsize = 6,
     .header = ogm_header,
     .packet = ogm_packet
 };
 
-ogg_codec_t ogm_audio_codec = {
+const ogg_codec_t ogm_audio_codec = {
     .magic = "\001audio",
     .magicsize = 6,
     .header = ogm_header,
     .packet = ogm_packet
 };
 
-ogg_codec_t ogm_text_codec = {
+const ogg_codec_t ogm_text_codec = {
     .magic = "\001text",
     .magicsize = 5,
     .header = ogm_header,
     .packet = ogm_packet
 };
 
-ogg_codec_t ogm_old_codec = {
+const ogg_codec_t ogm_old_codec = {
     .magic = "\001Direct Show Samples embedded in Ogg",
     .magicsize = 35,
     .header = ogm_dshow_header,

Modified: trunk/libavformat/oggparsespeex.c
==============================================================================
--- trunk/libavformat/oggparsespeex.c	(original)
+++ trunk/libavformat/oggparsespeex.c	Sun Aug 24 19:09:15 2008
@@ -54,7 +54,7 @@ static int speex_header(AVFormatContext 
     return 0;
 }
 
-ogg_codec_t speex_codec = {
+const ogg_codec_t speex_codec = {
     .magic = "Speex   ",
     .magicsize = 8,
     .header = speex_header

Modified: trunk/libavformat/oggparsetheora.c
==============================================================================
--- trunk/libavformat/oggparsetheora.c	(original)
+++ trunk/libavformat/oggparsetheora.c	Sun Aug 24 19:09:15 2008
@@ -130,7 +130,7 @@ theora_gptopts(AVFormatContext *ctx, int
     return iframe + pframe;
 }
 
-ogg_codec_t theora_codec = {
+const ogg_codec_t theora_codec = {
     .magic = "\200theora",
     .magicsize = 7,
     .header = theora_header,

Modified: trunk/libavformat/oggparsevorbis.c
==============================================================================
--- trunk/libavformat/oggparsevorbis.c	(original)
+++ trunk/libavformat/oggparsevorbis.c	Sun Aug 24 19:09:15 2008
@@ -219,7 +219,7 @@ vorbis_header (AVFormatContext * s, int 
     return os->seq < 3;
 }
 
-ogg_codec_t vorbis_codec = {
+const ogg_codec_t vorbis_codec = {
     .magic = "\001vorbis",
     .magicsize = 7,
     .header = vorbis_header