Revision f7e97aaf

View differences:

libavcodec/avcodec.h
262 262
    /* subtitle codecs */
263 263
    CODEC_ID_DVD_SUBTITLE= 0x17000,
264 264
    CODEC_ID_DVB_SUBTITLE,
265
    CODEC_ID_TEXT,
265 266

  
266 267
    CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG-2 TS
267 268
                                * stream (only used by libavformat) */
libavformat/matroska.c
58 58
    {"A_REAL/ATRC"      , CODEC_ID_ATRAC3},
59 59
    {"A_REAL/COOK"      , CODEC_ID_COOK},
60 60
//    {"A_REAL/SIPR"      , CODEC_ID_SIPRO},
61

  
62
    {"S_TEXT/ASCII"     , CODEC_ID_TEXT},
63
    {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
64
    {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
65

  
61 66
    {NULL               , CODEC_ID_NONE}
62 67
/* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */
63 68
};
libavformat/matroskadec.c
2028 2028
            track = matroska->tracks[i];
2029 2029
            track->stream_index = -1;
2030 2030

  
2031
            /* libavformat does not really support subtitles.
2032
             * Also apply some sanity checks. */
2033
            if ((track->type == MATROSKA_TRACK_TYPE_SUBTITLE) ||
2034
                (track->codec_id == NULL))
2031
            /* Apply some sanity checks. */
2032
            if (track->codec_id == NULL)
2035 2033
                continue;
2036 2034

  
2037 2035
            for(j=0; ff_mkv_codec_tags[j].str; j++){

Also available in: Unified diff