Revision 72415b2a libavformat/nutdec.c

View differences:

libavformat/nutdec.c
315 315
    switch(class)
316 316
    {
317 317
        case 0:
318
            st->codec->codec_type = CODEC_TYPE_VIDEO;
318
            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
319 319
            st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tmp);
320 320
            break;
321 321
        case 1:
322
            st->codec->codec_type = CODEC_TYPE_AUDIO;
322
            st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
323 323
            st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, tmp);
324 324
            break;
325 325
        case 2:
326
            st->codec->codec_type = CODEC_TYPE_SUBTITLE;
326
            st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
327 327
            st->codec->codec_id = ff_codec_get_id(ff_nut_subtitle_tags, tmp);
328 328
            break;
329 329
        case 3:
330
            st->codec->codec_type = CODEC_TYPE_DATA;
330
            st->codec->codec_type = AVMEDIA_TYPE_DATA;
331 331
            break;
332 332
        default:
333 333
            av_log(s, AV_LOG_ERROR, "unknown stream class (%d)\n", class);
......
349 349
        get_buffer(bc, st->codec->extradata, st->codec->extradata_size);
350 350
    }
351 351

  
352
    if (st->codec->codec_type == CODEC_TYPE_VIDEO){
352
    if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
353 353
        GET_V(st->codec->width , tmp > 0)
354 354
        GET_V(st->codec->height, tmp > 0)
355 355
        st->sample_aspect_ratio.num= ff_get_v(bc);
......
359 359
            return -1;
360 360
        }
361 361
        ff_get_v(bc); /* csp type */
362
    }else if (st->codec->codec_type == CODEC_TYPE_AUDIO){
362
    }else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO){
363 363
        GET_V(st->codec->sample_rate , tmp > 0)
364 364
        ff_get_v(bc); // samplerate_den
365 365
        GET_V(st->codec->channels, tmp > 0)

Also available in: Unified diff