Revision 1e3c9307

View differences:

libavformat/isom.c
167 167
    { CODEC_ID_NONE, 0 },
168 168
};
169 169

  
170
const AVCodecTag ff_codec_movsubtitle_tags[] = {
171
    { CODEC_ID_TEXT, MKTAG('t', 'e', 'x', 't') },
172
    { CODEC_ID_NONE, 0 },
173
};
174

  
170 175
/* map numeric codes from mdhd atom to ISO 639 */
171 176
/* cf. QTFileFormat.pdf p253, qtff.pdf p205 */
172 177
/* http://developer.apple.com/documentation/mac/Text/Text-368.html */
libavformat/isom.h
30 30
extern const AVCodecTag ff_mp4_obj_type[];
31 31
extern const AVCodecTag codec_movvideo_tags[];
32 32
extern const AVCodecTag codec_movaudio_tags[];
33
extern const AVCodecTag ff_codec_movsubtitle_tags[];
33 34

  
34 35
int ff_mov_iso639_to_lang(const char *lang, int mp4);
35 36
int ff_mov_lang_to_iso639(int code, char *to);
libavformat/mov.c
624 624
                id = codec_get_id(codec_bmp_tags, format);
625 625
            if (id > 0)
626 626
                st->codec->codec_type = CODEC_TYPE_VIDEO;
627
            else if(st->codec->codec_type == CODEC_TYPE_DATA){
628
                id = codec_get_id(ff_codec_movsubtitle_tags, format);
629
                if(id > 0)
630
                    st->codec->codec_type = CODEC_TYPE_SUBTITLE;
631
            }
627 632
        }
628 633

  
629 634
        dprintf(c->fc, "size=%d 4CC= %c%c%c%c codec_type=%d\n", size,

Also available in: Unified diff