Revision 01f4895c libavformat/electronicarts.c

View differences:

libavformat/electronicarts.c
188 188
        return AVERROR_NOMEM;
189 189
    av_set_pts_info(st, 33, 1, 90000);
190 190
    ea->video_stream_index = st->index;
191
    st->codec.codec_type = CODEC_TYPE_VIDEO;
192
    st->codec.codec_id = CODEC_ID_EA_MJPEG;
193
    st->codec.codec_tag = 0;  /* no fourcc */
191
    st->codec->codec_type = CODEC_TYPE_VIDEO;
192
    st->codec->codec_id = CODEC_ID_EA_MJPEG;
193
    st->codec->codec_tag = 0;  /* no fourcc */
194 194
#endif    
195 195

  
196 196
    /* initialize the audio decoder stream */
......
198 198
    if (!st)
199 199
        return AVERROR_NOMEM;
200 200
    av_set_pts_info(st, 33, 1, EA_SAMPLE_RATE);
201
    st->codec.codec_type = CODEC_TYPE_AUDIO;
202
    st->codec.codec_id = CODEC_ID_ADPCM_EA;
203
    st->codec.codec_tag = 0;  /* no tag */
204
    st->codec.channels = ea->num_channels;
205
    st->codec.sample_rate = EA_SAMPLE_RATE;
206
    st->codec.bits_per_sample = EA_BITS_PER_SAMPLE;
207
    st->codec.bit_rate = st->codec.channels * st->codec.sample_rate *
208
        st->codec.bits_per_sample / 4;
209
    st->codec.block_align = st->codec.channels * st->codec.bits_per_sample;
201
    st->codec->codec_type = CODEC_TYPE_AUDIO;
202
    st->codec->codec_id = CODEC_ID_ADPCM_EA;
203
    st->codec->codec_tag = 0;  /* no tag */
204
    st->codec->channels = ea->num_channels;
205
    st->codec->sample_rate = EA_SAMPLE_RATE;
206
    st->codec->bits_per_sample = EA_BITS_PER_SAMPLE;
207
    st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
208
        st->codec->bits_per_sample / 4;
209
    st->codec->block_align = st->codec->channels * st->codec->bits_per_sample;
210 210

  
211 211
    ea->audio_stream_index = st->index;
212 212
    ea->audio_frame_counter = 0;

Also available in: Unified diff