RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make ogg_codec_t descriptions const 

Originally committed as revision 14948 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2008-08-24 17:09:15 +00:00
parent c18545929e
commit cd34bc7617
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/oggdec.c
View File

@ -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;

18
libavformat/oggdec.h
View File

@ -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);

4
libavformat/oggparseflac.c
View File

@ -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

8
libavformat/oggparseogm.c
View File

@ -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,

2
libavformat/oggparsespeex.c
View File

@ -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

2
libavformat/oggparsetheora.c
View File

@ -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,

2
libavformat/oggparsevorbis.c
View File

@ -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