From cd34bc76174397712fc0b2502d550a45dd25c11c Mon Sep 17 00:00:00 2001
From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Sun, 24 Aug 2008 17:09:15 +0000
Subject: Make ogg_codec_t descriptions const

Originally committed as revision 14948 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/oggdec.c         |  4 ++--
 libavformat/oggdec.h         | 18 +++++++++---------
 libavformat/oggparseflac.c   |  4 ++--
 libavformat/oggparseogm.c    |  8 ++++----
 libavformat/oggparsespeex.c  |  2 +-
 libavformat/oggparsetheora.c |  2 +-
 libavformat/oggparsevorbis.c |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 5459e1784b..ceec6442b4 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -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;
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 4e88d0e393..1be3fc1943 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -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);
 
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index 386a70ebd4..7a0084e7fb 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -85,13 +85,13 @@ old_flac_header (AVFormatContext * s, int idx)
     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
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index af1e4cfaaa..72a3aed98f 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -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,
diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index ad2f0b7db4..1612f2e632 100644
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -54,7 +54,7 @@ static int speex_header(AVFormatContext *s, int idx) {
     return 0;
 }
 
-ogg_codec_t speex_codec = {
+const ogg_codec_t speex_codec = {
     .magic = "Speex   ",
     .magicsize = 8,
     .header = speex_header
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index 1a16ca501a..d1a4fdf998 100644
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -130,7 +130,7 @@ theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp)
     return iframe + pframe;
 }
 
-ogg_codec_t theora_codec = {
+const ogg_codec_t theora_codec = {
     .magic = "\200theora",
     .magicsize = 7,
     .header = theora_header,
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index b116273f8c..a773847f82 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -219,7 +219,7 @@ vorbis_header (AVFormatContext * s, int idx)
     return os->seq < 3;
 }
 
-ogg_codec_t vorbis_codec = {
+const ogg_codec_t vorbis_codec = {
     .magic = "\001vorbis",
     .magicsize = 7,
     .header = vorbis_header
-- 
cgit v1.2.3