diff options
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavformat/isom.c | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f8c81783aa..77f42efaf0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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, diff --git a/libavformat/isom.c b/libavformat/isom.c index c0af2d2bbe..5a67aec8ea 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -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 }, }; diff --git a/libavformat/mov.c b/libavformat/mov.c index cc3dc70211..f39d9a227f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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; |