Revision 72415b2a libavformat/oggparseogm.c

View differences:

libavformat/oggparseogm.c
49 49

  
50 50
        if(*p == 'v'){
51 51
            int tag;
52
            st->codec->codec_type = CODEC_TYPE_VIDEO;
52
            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
53 53
            p += 8;
54 54
            tag = bytestream_get_le32(&p);
55 55
            st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
56 56
            st->codec->codec_tag = tag;
57 57
        } else if (*p == 't') {
58
            st->codec->codec_type = CODEC_TYPE_SUBTITLE;
58
            st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
59 59
            st->codec->codec_id = CODEC_ID_TEXT;
60 60
            p += 12;
61 61
        } else {
62 62
            uint8_t acid[5];
63 63
            int cid;
64
            st->codec->codec_type = CODEC_TYPE_AUDIO;
64
            st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
65 65
            p += 8;
66 66
            bytestream_get_buffer(&p, acid, 4);
67 67
            acid[4] = 0;
......
78 78

  
79 79
        p += 8;                     /* buffersize + bits_per_sample */
80 80

  
81
        if(st->codec->codec_type == CODEC_TYPE_VIDEO){
81
        if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
82 82
            st->codec->width = bytestream_get_le32(&p);
83 83
            st->codec->height = bytestream_get_le32(&p);
84 84
            st->codec->time_base.den = spu * 10000000;
......
117 117
    t = AV_RL32(p + 96);
118 118

  
119 119
    if(t == 0x05589f80){
120
        st->codec->codec_type = CODEC_TYPE_VIDEO;
120
        st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
121 121
        st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68));
122 122
        st->codec->time_base.den = 10000000;
123 123
        st->codec->time_base.num = AV_RL64(p + 164);
124 124
        st->codec->width = AV_RL32(p + 176);
125 125
        st->codec->height = AV_RL32(p + 180);
126 126
    } else if(t == 0x05589f81){
127
        st->codec->codec_type = CODEC_TYPE_AUDIO;
127
        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
128 128
        st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124));
129 129
        st->codec->channels = AV_RL16(p + 126);
130 130
        st->codec->sample_rate = AV_RL32(p + 128);

Also available in: Unified diff