Revision 01f4895c libavformat/wc3movie.c

View differences:

libavformat/wc3movie.c
239 239
        return AVERROR_NOMEM;
240 240
    av_set_pts_info(st, 33, 1, 90000);
241 241
    wc3->video_stream_index = st->index;
242
    st->codec.codec_type = CODEC_TYPE_VIDEO;
243
    st->codec.codec_id = CODEC_ID_XAN_WC3;
244
    st->codec.codec_tag = 0;  /* no fourcc */
245
    st->codec.width = wc3->width;
246
    st->codec.height = wc3->height;
242
    st->codec->codec_type = CODEC_TYPE_VIDEO;
243
    st->codec->codec_id = CODEC_ID_XAN_WC3;
244
    st->codec->codec_tag = 0;  /* no fourcc */
245
    st->codec->width = wc3->width;
246
    st->codec->height = wc3->height;
247 247

  
248 248
    /* palette considerations */
249
    st->codec.palctrl = &wc3->palette_control;
249
    st->codec->palctrl = &wc3->palette_control;
250 250

  
251 251
    st = av_new_stream(s, 0);
252 252
    if (!st)
253 253
        return AVERROR_NOMEM;
254 254
    av_set_pts_info(st, 33, 1, 90000);
255 255
    wc3->audio_stream_index = st->index;
256
    st->codec.codec_type = CODEC_TYPE_AUDIO;
257
    st->codec.codec_id = CODEC_ID_PCM_S16LE;
258
    st->codec.codec_tag = 1;
259
    st->codec.channels = WC3_AUDIO_CHANNELS;
260
    st->codec.bits_per_sample = WC3_AUDIO_BITS;
261
    st->codec.sample_rate = WC3_SAMPLE_RATE;
262
    st->codec.bit_rate = st->codec.channels * st->codec.sample_rate *
263
        st->codec.bits_per_sample;
264
    st->codec.block_align = WC3_AUDIO_BITS * WC3_AUDIO_CHANNELS;
256
    st->codec->codec_type = CODEC_TYPE_AUDIO;
257
    st->codec->codec_id = CODEC_ID_PCM_S16LE;
258
    st->codec->codec_tag = 1;
259
    st->codec->channels = WC3_AUDIO_CHANNELS;
260
    st->codec->bits_per_sample = WC3_AUDIO_BITS;
261
    st->codec->sample_rate = WC3_SAMPLE_RATE;
262
    st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
263
        st->codec->bits_per_sample;
264
    st->codec->block_align = WC3_AUDIO_BITS * WC3_AUDIO_CHANNELS;
265 265

  
266 266
    return 0;
267 267
}

Also available in: Unified diff