virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Add CODEC_ID_MOV_TEXT and use it instead of modifying the stream in the mov demuxer.

Browse Source 
Originally committed as revision 11638 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2008-01-27 19:57:04 +00:00
parent cf6cb7c562
commit cc8c2c6ab3
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/avcodec.h
View File

@@ -283,6 +283,7 @@ enum CodecID {
CODEC_ID_TEXT, ///< raw UTF-8 text
CODEC_ID_XSUB,
CODEC_ID_SSA,
CODEC_ID_MOV_TEXT,
/* other specific kind of codecs (generaly used for attachments) */
CODEC_ID_TTF= 0x18000,

2
libavformat/isom.c
View File

@@ -169,7 +169,7 @@ const AVCodecTag codec_movaudio_tags[] = {
};
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 },
};

6
libavformat/mov.c
View File

@@ -1543,12 +1543,6 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
} 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;