Revision 01f4895c libavformat/idroq.c

View differences:

libavformat/idroq.c
145 145
    /* set the pts reference (1 pts = 1/90000) */
146 146
    av_set_pts_info(st, 33, 1, 90000);
147 147
    roq->video_stream_index = st->index;
148
    st->codec.codec_type = CODEC_TYPE_VIDEO;
149
    st->codec.codec_id = CODEC_ID_ROQ;
150
    st->codec.codec_tag = 0;  /* no fourcc */
151
    st->codec.width = roq->width;
152
    st->codec.height = roq->height;
148
    st->codec->codec_type = CODEC_TYPE_VIDEO;
149
    st->codec->codec_id = CODEC_ID_ROQ;
150
    st->codec->codec_tag = 0;  /* no fourcc */
151
    st->codec->width = roq->width;
152
    st->codec->height = roq->height;
153 153

  
154 154
    if (roq->audio_channels) {
155 155
        st = av_new_stream(s, 0);
......
157 157
            return AVERROR_NOMEM;
158 158
        av_set_pts_info(st, 33, 1, 90000);
159 159
        roq->audio_stream_index = st->index;
160
        st->codec.codec_type = CODEC_TYPE_AUDIO;
161
        st->codec.codec_id = CODEC_ID_ROQ_DPCM;
162
        st->codec.codec_tag = 0;  /* no tag */
163
        st->codec.channels = roq->audio_channels;
164
        st->codec.sample_rate = RoQ_AUDIO_SAMPLE_RATE;
165
        st->codec.bits_per_sample = 16;
166
        st->codec.bit_rate = st->codec.channels * st->codec.sample_rate *
167
            st->codec.bits_per_sample;
168
        st->codec.block_align = st->codec.channels * st->codec.bits_per_sample;
160
        st->codec->codec_type = CODEC_TYPE_AUDIO;
161
        st->codec->codec_id = CODEC_ID_ROQ_DPCM;
162
        st->codec->codec_tag = 0;  /* no tag */
163
        st->codec->channels = roq->audio_channels;
164
        st->codec->sample_rate = RoQ_AUDIO_SAMPLE_RATE;
165
        st->codec->bits_per_sample = 16;
166
        st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
167
            st->codec->bits_per_sample;
168
        st->codec->block_align = st->codec->channels * st->codec->bits_per_sample;
169 169
    }
170 170

  
171 171
    return 0;

Also available in: Unified diff