Revision 72415b2a libavformat/libnut.c

View differences:

libavformat/libnut.c
77 77
        int fourcc = 0;
78 78
        int num, denom, ssize;
79 79

  
80
        s[i].type = codec->codec_type == CODEC_TYPE_VIDEO ? NUT_VIDEO_CLASS : NUT_AUDIO_CLASS;
80
        s[i].type = codec->codec_type == AVMEDIA_TYPE_VIDEO ? NUT_VIDEO_CLASS : NUT_AUDIO_CLASS;
81 81

  
82 82
        if (codec->codec_tag) fourcc = codec->codec_tag;
83 83
        else fourcc = ff_codec_get_tag(nut_tags, codec->codec_id);
84 84

  
85 85
        if (!fourcc) {
86
            if (codec->codec_type == CODEC_TYPE_VIDEO) fourcc = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id);
87
            if (codec->codec_type == CODEC_TYPE_AUDIO) fourcc = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id);
86
            if (codec->codec_type == AVMEDIA_TYPE_VIDEO) fourcc = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id);
87
            if (codec->codec_type == AVMEDIA_TYPE_AUDIO) fourcc = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id);
88 88
        }
89 89

  
90 90
        s[i].fourcc_len = 4;
......
102 102
        s[i].codec_specific_len = codec->extradata_size;
103 103
        s[i].codec_specific = codec->extradata;
104 104

  
105
        if (codec->codec_type == CODEC_TYPE_VIDEO) {
105
        if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
106 106
            s[i].width = codec->width;
107 107
            s[i].height = codec->height;
108 108
            s[i].sample_width = 0;
......
234 234

  
235 235
        switch(s[i].type) {
236 236
        case NUT_AUDIO_CLASS:
237
            st->codec->codec_type = CODEC_TYPE_AUDIO;
237
            st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
238 238
            if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, st->codec->codec_tag);
239 239

  
240 240
            st->codec->channels = s[i].channel_count;
241 241
            st->codec->sample_rate = s[i].samplerate_num / s[i].samplerate_denom;
242 242
            break;
243 243
        case NUT_VIDEO_CLASS:
244
            st->codec->codec_type = CODEC_TYPE_VIDEO;
244
            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
245 245
            if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, st->codec->codec_tag);
246 246

  
247 247
            st->codec->width = s[i].width;

Also available in: Unified diff