---
libavformat/segafilm.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 5516019..f74c3c0 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -151,15 +151,15 @@ static int film_read_header(AVFormatContext *s)
if (!st)
return AVERROR(ENOMEM);
film->video_stream_index = st->index;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = film->video_type;
- st->codec->codec_tag = 0; /* no fourcc */
- st->codec->width = AV_RB32(&scratch[16]);
- st->codec->height = AV_RB32(&scratch[12]);
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = film->video_type;
+ st->codecpar->codec_tag = 0; /* no fourcc */
+ st->codecpar->width = AV_RB32(&scratch[16]);
+ st->codecpar->height = AV_RB32(&scratch[12]);
if (film->video_type == AV_CODEC_ID_RAWVIDEO) {
if (scratch[20] == 24) {
- st->codec->pix_fmt = AV_PIX_FMT_RGB24;
+ st->codecpar->format = AV_PIX_FMT_RGB24;
} else {
av_log(s, AV_LOG_ERROR, "raw video is using unhandled
%dbpp\n", scratch[20]);
return -1;
@@ -172,24 +172,24 @@ static int film_read_header(AVFormatContext *s)
if (!st)
return AVERROR(ENOMEM);
film->audio_stream_index = st->index;
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = film->audio_type;
- st->codec->codec_tag = 1;
- st->codec->channels = film->audio_channels;
- st->codec->sample_rate = film->audio_samplerate;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = film->audio_type;
+ st->codecpar->codec_tag = 1;
+ st->codecpar->channels = film->audio_channels;
+ st->codecpar->sample_rate = film->audio_samplerate;
if (film->audio_type == AV_CODEC_ID_ADPCM_ADX) {
- st->codec->bits_per_coded_sample = 18 * 8 / 32;
- st->codec->block_align = st->codec->channels * 18;
+ st->codecpar->bits_per_coded_sample = 18 * 8 / 32;
+ st->codecpar->block_align = st->codecpar->channels * 18;
st->need_parsing = AVSTREAM_PARSE_FULL;
} else {
- st->codec->bits_per_coded_sample = film->audio_bits;
- st->codec->block_align = st->codec->channels *
- st->codec->bits_per_coded_sample / 8;
+ st->codecpar->bits_per_coded_sample = film->audio_bits;
+ st->codecpar->block_align = st->codecpar->channels *
+ st->codecpar->bits_per_coded_sample / 8;
}
- st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
- st->codec->bits_per_coded_sample;
+ st->codecpar->bit_rate = st->codecpar->channels *
st->codecpar->sample_rate *
+ st->codecpar->bits_per_coded_sample;
}
/* load the sample table */
@@ -207,7 +207,7 @@ static int film_read_header(AVFormatContext *s)
for (i = 0; i < s->nb_streams; i++) {
st = s->streams[i];
- if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
avpriv_set_pts_info(st, 33, 1, film->base_clock);
else
avpriv_set_pts_info(st, 64, 1, film->audio_samplerate);
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
