diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-07 02:18:17 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-07 22:11:21 +0200 |
| commit | 5012c07336eff0e928afb57c6d38271e316c0a6c (patch) | |
| tree | 59b26015dd83db4208d99ae0f50ece94fd84ef78 /libavformat | |
| parent | 50ec8a2acd4f7ad422c0883153b856e737adf973 (diff) | |
| download | ffmpeg-5012c07336eff0e928afb57c6d38271e316c0a6c.tar.gz | |
Support detecting and demuxing EIA-608 subtitles in mov.
The format is slightly proprietary.
DVDs use a format of
code byte (0x00, 0x01, 0xfe or 0xff), two data bytes
MOV uses instead
cdat/cdt2 atom, two data bytes
Auto-detecting and supporting both in one decoder is trivial,
so a single codec ID is used.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/mov.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 9182008376..34daeaeeeb 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -287,6 +287,7 @@ const AVCodecTag ff_codec_movaudio_tags[] = { const AVCodecTag ff_codec_movsubtitle_tags[] = { { CODEC_ID_MOV_TEXT, MKTAG('t', 'e', 'x', 't') }, { CODEC_ID_MOV_TEXT, MKTAG('t', 'x', '3', 'g') }, + { CODEC_ID_EIA_608, MKTAG('c', '6', '0', '8') }, { CODEC_ID_NONE, 0 }, }; diff --git a/libavformat/mov.c b/libavformat/mov.c index c32d22ea8c..b4ff1df2eb 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1222,7 +1222,9 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) id = ff_codec_get_id(ff_codec_bmp_tags, format); if (id > 0) st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - else if (st->codec->codec_type == AVMEDIA_TYPE_DATA){ + else if (st->codec->codec_type == AVMEDIA_TYPE_DATA || + (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE && + st->codec->codec_id == CODEC_ID_NONE)){ id = ff_codec_get_id(ff_codec_movsubtitle_tags, format); if (id > 0) st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; |