Revision 1326621c

View differences:

libavformat/nut.c
22 22
#include "nut.h"
23 23
#include "tree.h"
24 24

  
25
const AVCodecTag ff_nut_subtitle_tags[] = {
26
    { CODEC_ID_TEXT        , MKTAG('U', 'T', 'F', '8') },
27
    { CODEC_ID_SSA         , MKTAG('S', 'S', 'A',  0 ) },
28
    { CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') },
29
    { CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') },
30
    { CODEC_ID_NONE        , 0                         }
31
};
32

  
25 33
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
26 34
    int i;
27 35
    for(i=0; i<nut->avf->nb_streams; i++){
libavformat/nut.h
97 97
    struct AVTreeNode *syncpoints;
98 98
} NUTContext;
99 99

  
100
extern const AVCodecTag ff_nut_subtitle_tags[];
101

  
100 102
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val);
101 103
int64_t ff_lsb2full(StreamContext *stream, int64_t lsb);
102 104
int ff_nut_sp_pos_cmp(syncpoint_t *a, syncpoint_t *b);
libavformat/nutdec.c
322 322
            break;
323 323
        case 2:
324 324
            st->codec->codec_type = CODEC_TYPE_SUBTITLE;
325
//            st->codec->codec_id = codec_get_id(codec_wav_tags, tmp); FIXME
325
            st->codec->codec_id = codec_get_id(ff_nut_subtitle_tags, tmp);
326 326
            break;
327 327
        case 3:
328 328
            st->codec->codec_type = CODEC_TYPE_DATA;
libavformat/nutenc.c
771 771
    write_packet,
772 772
    write_trailer,
773 773
    .flags = AVFMT_GLOBALHEADER,
774
    .codec_tag= (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0},
774
    .codec_tag= (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, ff_nut_subtitle_tags, 0},
775 775
};

Also available in: Unified diff