---
libavformat/xa.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavformat/xa.c b/libavformat/xa.c
index 57a36bc..06b9c3f 100644
--- a/libavformat/xa.c
+++ b/libavformat/xa.c
@@ -73,21 +73,21 @@ static int xa_read_header(AVFormatContext *s)
if (!st)
return AVERROR(ENOMEM);
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = AV_CODEC_ID_ADPCM_EA_MAXIS_XA;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = AV_CODEC_ID_ADPCM_EA_MAXIS_XA;
avio_skip(pb, 4); /* Skip the XA ID */
xa->out_size = avio_rl32(pb);
avio_skip(pb, 2); /* Skip the tag */
- st->codec->channels = avio_rl16(pb);
- st->codec->sample_rate = avio_rl32(pb);
+ st->codecpar->channels = avio_rl16(pb);
+ st->codecpar->sample_rate = avio_rl32(pb);
avio_skip(pb, 4); /* Skip average byte rate */
avio_skip(pb, 2); /* Skip block align */
avio_skip(pb, 2); /* Skip bits-per-sample */
- st->codec->bit_rate = av_clip(15LL * st->codec->channels * 8 *
- st->codec->sample_rate / 28, 0, INT_MAX);
+ st->codecpar->bit_rate = av_clip(15LL * st->codecpar->channels * 8 *
+ st->codecpar->sample_rate / 28, 0,
INT_MAX);
- avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+ avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
st->start_time = 0;
return 0;
@@ -105,7 +105,7 @@ static int xa_read_packet(AVFormatContext *s,
if (xa->sent_bytes >= xa->out_size)
return AVERROR_EOF;
/* 1 byte header and 14 bytes worth of samples * number channels per block
*/
- packet_size = 15*st->codec->channels;
+ packet_size = 15*st->codecpar->channels;
ret = av_get_packet(pb, pkt, packet_size);
if(ret < 0)
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
