Revision 74e8ccad libavformat/rmdec.c

View differences:

libavformat/rmdec.c
49 49
    int audio_pkt_cnt; ///< Output packet counter
50 50
} RMDemuxContext;
51 51

  
52
static const AVCodecTag rm_codec_tags[] = {
53
    { CODEC_ID_RV10,   MKTAG('R','V','1','0') },
54
    { CODEC_ID_RV20,   MKTAG('R','V','2','0') },
55
    { CODEC_ID_RV20,   MKTAG('R','V','T','R') },
56
    { CODEC_ID_RV30,   MKTAG('R','V','3','0') },
57
    { CODEC_ID_RV40,   MKTAG('R','V','4','0') },
58
    { CODEC_ID_AC3,    MKTAG('d','n','e','t') },
59
    { CODEC_ID_RA_144, MKTAG('l','p','c','J') },
60
    { CODEC_ID_RA_288, MKTAG('2','8','_','8') },
61
    { CODEC_ID_COOK,   MKTAG('c','o','o','k') },
62
    { CODEC_ID_ATRAC3, MKTAG('a','t','r','c') },
63
    { CODEC_ID_SIPR,   MKTAG('s','i','p','r') },
64
    { CODEC_ID_AAC,    MKTAG('r','a','a','c') },
65
    { CODEC_ID_AAC,    MKTAG('r','a','c','p') },
66
    { CODEC_ID_NONE },
67
};
68

  
69 52
static const unsigned char sipr_swaps[38][2] = {
70 53
    {  0, 63 }, {  1, 22 }, {  2, 44 }, {  3, 90 },
71 54
    {  5, 81 }, {  7, 31 }, {  8, 86 }, {  9, 58 },
......
197 180
        }
198 181
        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
199 182
        st->codec->codec_tag  = AV_RL32(buf);
200
        st->codec->codec_id   = ff_codec_get_id(rm_codec_tags, st->codec->codec_tag);
183
        st->codec->codec_id   = ff_codec_get_id(ff_rm_codec_tags,
184
                                                st->codec->codec_tag);
201 185
        switch (st->codec->codec_id) {
202 186
        case CODEC_ID_AC3:
203 187
            st->need_parsing = AVSTREAM_PARSE_FULL;
......
303 287
            goto skip;
304 288
        }
305 289
        st->codec->codec_tag = get_le32(pb);
306
        st->codec->codec_id  = ff_codec_get_id(rm_codec_tags, st->codec->codec_tag);
290
        st->codec->codec_id  = ff_codec_get_id(ff_rm_codec_tags,
291
                                               st->codec->codec_tag);
307 292
//        av_log(s, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
308 293
        if (st->codec->codec_id == CODEC_ID_NONE)
309 294
            goto fail1;

Also available in: Unified diff