MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add ff_ prefix to ogg_codec_t structs

Browse Source 
Originally committed as revision 14951 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2008-08-24 17:37:43 +00:00
parent aecf157ed0
commit 547ea47d4f
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/oggdec.c
View File

@ -38,15 +38,15 @@
#define DECODER_BUFFER_SIZE MAX_PAGE_SIZE
static const ogg_codec_t * const ogg_codecs[] = {
&speex_codec,
&vorbis_codec,
&theora_codec,
&flac_codec,
&old_flac_codec,
&ogm_video_codec,
&ogm_audio_codec,
&ogm_text_codec,
&ogm_old_codec,
&ff_speex_codec,
&ff_vorbis_codec,
&ff_theora_codec,
&ff_flac_codec,
&ff_old_flac_codec,
&ff_ogm_video_codec,
&ff_ogm_audio_codec,
&ff_ogm_text_codec,
&ff_ogm_old_codec,
NULL
};

18
libavformat/oggdec.h
View File

@ -75,15 +75,15 @@ typedef struct ogg {
#define OGG_FLAG_BOS 2
#define OGG_FLAG_EOS 4
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 const ogg_codec_t ff_flac_codec;
extern const ogg_codec_t ff_ogm_audio_codec;
extern const ogg_codec_t ff_ogm_old_codec;
extern const ogg_codec_t ff_ogm_text_codec;
extern const ogg_codec_t ff_ogm_video_codec;
extern const ogg_codec_t ff_old_flac_codec;
extern const ogg_codec_t ff_speex_codec;
extern const ogg_codec_t ff_theora_codec;
extern const ogg_codec_t ff_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;
}
const ogg_codec_t flac_codec = {
const ogg_codec_t ff_flac_codec = {
.magic = "\177FLAC",
.magicsize = 5,
.header = flac_header
};
const ogg_codec_t old_flac_codec = {
const ogg_codec_t ff_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;
}
const ogg_codec_t ogm_video_codec = {
const ogg_codec_t ff_ogm_video_codec = {
.magic = "\001video",
.magicsize = 6,
.header = ogm_header,
.packet = ogm_packet
};
const ogg_codec_t ogm_audio_codec = {
const ogg_codec_t ff_ogm_audio_codec = {
.magic = "\001audio",
.magicsize = 6,
.header = ogm_header,
.packet = ogm_packet
};
const ogg_codec_t ogm_text_codec = {
const ogg_codec_t ff_ogm_text_codec = {
.magic = "\001text",
.magicsize = 5,
.header = ogm_header,
.packet = ogm_packet
};
const ogg_codec_t ogm_old_codec = {
const ogg_codec_t ff_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;
}
const ogg_codec_t speex_codec = {
const ogg_codec_t ff_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;
}
const ogg_codec_t theora_codec = {
const ogg_codec_t ff_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;
}
const ogg_codec_t vorbis_codec = {
const ogg_codec_t ff_vorbis_codec = {
.magic = "\001vorbis",
.magicsize = 7,
.header = vorbis_header