virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Set correct codec type and id for text subtitles.

Browse Source 
fixes http://samples.mplayerhq.hu/mov/subtitles-embedded/subtitlemovie.mov
closes issue341

Originally committed as revision 11624 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-01-26 20:30:03 +00:00
parent 41e19673ef
commit 1e3c9307e6
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/isom.c
View File

@ -167,6 +167,11 @@ const AVCodecTag codec_movaudio_tags[] = {
{ CODEC_ID_NONE, 0 }, { CODEC_ID_NONE, 0 },
}; };
const AVCodecTag ff_codec_movsubtitle_tags[] = {
{ CODEC_ID_TEXT, MKTAG('t', 'e', 'x', 't') },
{ CODEC_ID_NONE, 0 },
};
/* map numeric codes from mdhd atom to ISO 639 */ /* map numeric codes from mdhd atom to ISO 639 */
/* cf. QTFileFormat.pdf p253, qtff.pdf p205 */ /* cf. QTFileFormat.pdf p253, qtff.pdf p205 */
/* http://developer.apple.com/documentation/mac/Text/Text-368.html */ /* http://developer.apple.com/documentation/mac/Text/Text-368.html */

1
libavformat/isom.h
View File

@ -30,6 +30,7 @@
extern const AVCodecTag ff_mp4_obj_type[]; extern const AVCodecTag ff_mp4_obj_type[];
extern const AVCodecTag codec_movvideo_tags[]; extern const AVCodecTag codec_movvideo_tags[];
extern const AVCodecTag codec_movaudio_tags[]; extern const AVCodecTag codec_movaudio_tags[];
extern const AVCodecTag ff_codec_movsubtitle_tags[];
int ff_mov_iso639_to_lang(const char *lang, int mp4); int ff_mov_iso639_to_lang(const char *lang, int mp4);
int ff_mov_lang_to_iso639(int code, char *to); int ff_mov_lang_to_iso639(int code, char *to);

5
libavformat/mov.c
View File

@ -624,6 +624,11 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
id = codec_get_id(codec_bmp_tags, format); id = codec_get_id(codec_bmp_tags, format);
if (id > 0) if (id > 0)
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
else if(st->codec->codec_type == CODEC_TYPE_DATA){
id = codec_get_id(ff_codec_movsubtitle_tags, format);
if(id > 0)
st->codec->codec_type = CODEC_TYPE_SUBTITLE;
}
} }
dprintf(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size, dprintf(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size,