---
libavformat/oggparseogm.c | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 913282a..3ce11bd 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -50,24 +50,24 @@ ogm_header(AVFormatContext *s, int idx)
if (bytestream2_peek_byte(&p) == 'v'){
int tag;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
bytestream2_skip(&p, 8);
tag = bytestream2_get_le32(&p);
- st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
- st->codec->codec_tag = tag;
+ st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
+ st->codecpar->codec_tag = tag;
} else if (bytestream2_peek_byte(&p) == 't') {
- st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
- st->codec->codec_id = AV_CODEC_ID_TEXT;
+ st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
+ st->codecpar->codec_id = AV_CODEC_ID_TEXT;
bytestream2_skip(&p, 12);
} else {
uint8_t acid[5] = { 0 };
int cid;
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
bytestream2_skip(&p, 8);
bytestream2_get_buffer(&p, acid, 4);
acid[4] = 0;
cid = strtol(acid, NULL, 16);
- st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid);
+ st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid);
st->need_parsing = AVSTREAM_PARSE_FULL;
}
@@ -83,16 +83,16 @@ ogm_header(AVFormatContext *s, int idx)
bytestream2_skip(&p, 4); /* default_len */
bytestream2_skip(&p, 8); /* buffersize + bits_per_sample */
- if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
- st->codec->width = bytestream2_get_le32(&p);
- st->codec->height = bytestream2_get_le32(&p);
+ if(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
+ st->codecpar->width = bytestream2_get_le32(&p);
+ st->codecpar->height = bytestream2_get_le32(&p);
avpriv_set_pts_info(st, 64, time_unit, spu * 10000000);
} else {
- st->codec->channels = bytestream2_get_le16(&p);
+ st->codecpar->channels = bytestream2_get_le16(&p);
bytestream2_skip(&p, 2); /* block_align */
- st->codec->bit_rate = bytestream2_get_le32(&p) * 8;
- st->codec->sample_rate = spu * 10000000 / time_unit;
- avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+ st->codecpar->bit_rate = bytestream2_get_le32(&p) * 8;
+ st->codecpar->sample_rate = spu * 10000000 / time_unit;
+ avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
}
} else if (bytestream2_peek_byte(&p) == 3) {
bytestream2_skip(&p, 7);
@@ -120,17 +120,17 @@ ogm_dshow_header(AVFormatContext *s, int idx)
t = AV_RL32(p + 96);
if(t == 0x05589f80){
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p +
68));
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p
+ 68));
avpriv_set_pts_info(st, 64, AV_RL64(p + 164), 10000000);
- st->codec->width = AV_RL32(p + 176);
- st->codec->height = AV_RL32(p + 180);
+ st->codecpar->width = AV_RL32(p + 176);
+ st->codecpar->height = AV_RL32(p + 180);
} else if(t == 0x05589f81){
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p +
124));
- st->codec->channels = AV_RL16(p + 126);
- st->codec->sample_rate = AV_RL32(p + 128);
- st->codec->bit_rate = AV_RL32(p + 132) * 8;
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p
+ 124));
+ st->codecpar->channels = AV_RL16(p + 126);
+ st->codecpar->sample_rate = AV_RL32(p + 128);
+ st->codecpar->bit_rate = AV_RL32(p + 132) * 8;
}
return 1;
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
