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

Write subtitle tracks 

Originally committed as revision 10330 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2007-09-05 00:23:49 +00:00
parent 95527e0669
commit 663a5d9d2d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/matroskaenc.c
View File

@ -475,6 +475,9 @@ static int mkv_write_tracks(AVFormatContext *s)
end_ebml_master(pb, subinfo);
break;
case CODEC_TYPE_SUBTITLE:
put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_SUBTITLE);
break;
default:
av_log(s, AV_LOG_ERROR, "Only audio and video are supported for Matroska.");
break;
@ -583,7 +586,14 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
mkv->cluster_pts = pkt->pts;
}
if (s->streams[pkt->stream_index]->codec->codec_type != CODEC_TYPE_SUBTITLE) {
mkv_write_block(s, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7);
} else {
offset_t blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP);
mkv_write_block(s, MATROSKA_ID_BLOCK, pkt, 0);
put_ebml_uint(pb, MATROSKA_ID_DURATION, pkt->duration);
end_ebml_master(pb, blockgroup);
}
if (s->streams[pkt->stream_index]->codec->codec_type == CODEC_TYPE_VIDEO && keyframe) {
if (mkv_add_cuepoint(mkv->cues, pkt, mkv->cluster_pos) < 0)