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

Add support for ogg text subtitles.

Browse Source 
Originally committed as revision 11698 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2008-01-31 22:30:55 +00:00
parent b8fe8ab062
commit 2331e31c23
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/oggdec.c
View File

@ -44,6 +44,7 @@ static ogg_codec_t *ogg_codecs[] = {
&old_flac_codec,
&ogm_video_codec,
&ogm_audio_codec,
&ogm_text_codec,
&ogm_old_codec,
NULL
};

1
libavformat/oggdec.h
View File

@ -81,6 +81,7 @@ extern ogg_codec_t flac_codec;
extern ogg_codec_t old_flac_codec;
extern ogg_codec_t ogm_video_codec;
extern ogg_codec_t ogm_audio_codec;
extern ogg_codec_t ogm_text_codec;
extern ogg_codec_t ogm_old_codec;
extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);

11
libavformat/oggparseogm.c
View File

@ -55,6 +55,10 @@ ogm_header(AVFormatContext *s, int idx)
tag = bytestream_get_le32(&p);
st->codec->codec_id = codec_get_id(codec_bmp_tags, tag);
st->codec->codec_tag = tag;
} else if (*p == 't') {
st->codec->codec_type = CODEC_TYPE_SUBTITLE;
st->codec->codec_id = CODEC_ID_TEXT;
p += 12;
} else {
uint8_t acid[5];
int cid;
@ -158,6 +162,13 @@ ogg_codec_t ogm_audio_codec = {
.packet = ogm_packet
};
ogg_codec_t ogm_text_codec = {
.magic = "\001text",
.magicsize = 5,
.header = ogm_header,
.packet = ogm_packet
};
ogg_codec_t ogm_old_codec = {
.magic = "\001Direct Show Samples embedded in Ogg",
.magicsize = 35,