Revision 72415b2a libavformat/audiointerleave.c

View differences:

libavformat/audiointerleave.c
32 32
        AVStream *st = s->streams[i];
33 33
        AudioInterleaveContext *aic = st->priv_data;
34 34

  
35
        if (st->codec->codec_type == CODEC_TYPE_AUDIO)
35
        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
36 36
            av_fifo_free(aic->fifo);
37 37
    }
38 38
}
......
50 50
        AVStream *st = s->streams[i];
51 51
        AudioInterleaveContext *aic = st->priv_data;
52 52

  
53
        if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
53
        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
54 54
            aic->sample_size = (st->codec->channels *
55 55
                                av_get_bits_per_sample(st->codec->codec_id)) / 8;
56 56
            if (!aic->sample_size) {
......
103 103
    if (pkt) {
104 104
        AVStream *st = s->streams[pkt->stream_index];
105 105
        AudioInterleaveContext *aic = st->priv_data;
106
        if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
106
        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
107 107
            unsigned new_size = av_fifo_size(aic->fifo) + pkt->size;
108 108
            if (new_size > aic->fifo_size) {
109 109
                if (av_fifo_realloc2(aic->fifo, new_size) < 0)
......
122 122

  
123 123
    for (i = 0; i < s->nb_streams; i++) {
124 124
        AVStream *st = s->streams[i];
125
        if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
125
        if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
126 126
            AVPacket new_pkt;
127 127
            while (ff_interleave_new_audio_packet(s, &new_pkt, i, flush))
128 128
                ff_interleave_add_packet(s, &new_pkt, compare_ts);

Also available in: Unified diff