Mercurial > libavformat.hg

changeset 2461:3a1ecd4ad76d libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Write subtitle tracks
author conrad
date Wed, 05 Sep 2007 00:23:49 +0000
parents c13388c21c2d
children 2ffe818df0c6
files matroskaenc.c
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/matroskaenc.c	Wed Sep 05 00:23:47 2007 +0000
+++ b/matroskaenc.c	Wed Sep 05 00:23:49 2007 +0000
@@ -475,6 +475,9 @@
                 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 @@
         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)