comparison beosaudio.cpp @ 833:c33bf4d10c4c libavformat

minor compilation fix A few files are not in sync with the change of AVStream's codec member from inline struct to pointer. patch by (Sam Hocevar: sam, zoy org)

832:f02966f9bc62

    AudioData *s = (AudioData *)s1->priv_data;
    AVStream *st;
    int ret;

    st = s1->streams[0];
    s->sample_rate = st->codec.sample_rate;
    s->channels = st->codec.channels;
    ret = audio_open(s, 1, NULL);
    if (ret < 0)
        return -EIO;
    return 0;
}

    if (ret < 0) {
        av_free(st);
        return -EIO;
    }
    /* take real parameters */
    st->codec.codec_type = CODEC_TYPE_AUDIO;
    st->codec.codec_id = s->codec_id;
    st->codec.sample_rate = s->sample_rate;
    st->codec.channels = s->channels;
    return 0;
    av_set_pts_info(s1, 48, 1, 1000000);  /* 48 bits pts in us */
}

static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)

833:c33bf4d10c4c

    AudioData *s = (AudioData *)s1->priv_data;
    AVStream *st;
    int ret;

    st = s1->streams[0];
    s->sample_rate = st->codec->sample_rate;
    s->channels = st->codec->channels;
    ret = audio_open(s, 1, NULL);
    if (ret < 0)
        return -EIO;
    return 0;
}

    if (ret < 0) {
        av_free(st);
        return -EIO;
    }
    /* take real parameters */
    st->codec->codec_type = CODEC_TYPE_AUDIO;
    st->codec->codec_id = s->codec_id;
    st->codec->sample_rate = s->sample_rate;
    st->codec->channels = s->channels;
    return 0;
    av_set_pts_info(s1, 48, 1, 1000000);  /* 48 bits pts in us */
}

static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)