Mercurial > libavformat.hg

changeset 2974:4b6a9b61e9dd libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add CODEC_ID_MOV_TEXT and use it instead of modifying the stream in the mov demuxer.
author reimar
date Sun, 27 Jan 2008 19:57:04 +0000
parents 910ac68ab3b5
children be1915a872e2
files isom.c mov.c
diffstat 2 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/isom.c	Sun Jan 27 15:43:17 2008 +0000
+++ b/isom.c	Sun Jan 27 19:57:04 2008 +0000
@@ -169,7 +169,7 @@
 };
 
 const AVCodecTag ff_codec_movsubtitle_tags[] = {
-    { CODEC_ID_TEXT, MKTAG('t', 'e', 'x', 't') },
+    { CODEC_ID_MOV_TEXT, MKTAG('t', 'e', 'x', 't') },
     { CODEC_ID_NONE, 0 },
 };
 
--- a/mov.c	Sun Jan 27 15:43:17 2008 +0000
+++ b/mov.c	Sun Jan 27 19:57:04 2008 +0000
@@ -1543,12 +1543,6 @@
     } else {
 #endif
         av_get_packet(s->pb, pkt, sample->size);
-        if (s->streams[sc->ffindex]->codec->codec_id == CODEC_ID_TEXT) {
-            int textlen = FFMIN(AV_RB16(pkt->data), sample->size - 2);
-            textlen = FFMAX(textlen, 0);
-            memmove(pkt->data, pkt->data + 2, textlen);
-            pkt->size = textlen;
-        }
 #ifdef CONFIG_DV_DEMUXER
         if (mov->dv_demux) {
             void *pkt_destruct_func = pkt->destruct;