comparison oggparsevorbis.c @ 820:feca73904e67 libavformat

changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility

819:a6c035e7f429

    priv->len[os->seq] = os->psize;
    priv->packet[os->seq] = av_mallocz(os->psize);
    memcpy(priv->packet[os->seq], os->buf + os->pstart, os->psize);
    if (os->buf[os->pstart] == 1) {
        uint8_t *p = os->buf + os->pstart + 11; //skip up to the audio channels
        st->codec.channels = *p++;
        st->codec.sample_rate = le2me_32 (unaligned32 (p));
        p += 8; //skip maximum and and nominal bitrate
        st->codec.bit_rate = le2me_32 (unaligned32 (p)); //Minimum bitrate

        st->codec.codec_type = CODEC_TYPE_AUDIO;
        st->codec.codec_id = CODEC_ID_VORBIS;

    } else if (os->buf[os->pstart] == 3) {
        vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
    } else {
        st->codec.extradata_size =
            fixup_vorbis_headers(s, priv, &st->codec.extradata);
    }

    return os->seq < 3;
}

820:feca73904e67

    priv->len[os->seq] = os->psize;
    priv->packet[os->seq] = av_mallocz(os->psize);
    memcpy(priv->packet[os->seq], os->buf + os->pstart, os->psize);
    if (os->buf[os->pstart] == 1) {
        uint8_t *p = os->buf + os->pstart + 11; //skip up to the audio channels
        st->codec->channels = *p++;
        st->codec->sample_rate = le2me_32 (unaligned32 (p));
        p += 8; //skip maximum and and nominal bitrate
        st->codec->bit_rate = le2me_32 (unaligned32 (p)); //Minimum bitrate

        st->codec->codec_type = CODEC_TYPE_AUDIO;
        st->codec->codec_id = CODEC_ID_VORBIS;

    } else if (os->buf[os->pstart] == 3) {
        vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
    } else {
        st->codec->extradata_size =
            fixup_vorbis_headers(s, priv, &st->codec->extradata);
    }

    return os->seq < 3;
}