---
libavformat/oggparsedirac.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c
index 5685e00..a53197e 100644
--- a/libavformat/oggparsedirac.c
+++ b/libavformat/oggparsedirac.c
@@ -33,24 +33,24 @@ static int dirac_header(AVFormatContext *s, int idx)
int ret;
// already parsed the header
- if (st->codec->codec_id == AV_CODEC_ID_DIRAC)
+ if (st->codecpar->codec_id == AV_CODEC_ID_DIRAC)
return 0;
ret = av_dirac_parse_sequence_header(&dsh, os->buf + os->pstart + 13,
(os->psize - 13) * 8, s);
if (ret < 0)
return ret;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = AV_CODEC_ID_DIRAC;
- st->codec->width = dsh->width;
- st->codec->height = dsh->height;
- st->codec->pix_fmt = dsh->pix_fmt;
- st->codec->color_range = dsh->color_range;
- st->codec->color_trc = dsh->color_trc;
- st->codec->color_primaries = dsh->color_primaries;
- st->codec->colorspace = dsh->colorspace;
- st->codec->profile = dsh->profile;
- st->codec->level = dsh->level;
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = AV_CODEC_ID_DIRAC;
+ st->codecpar->width = dsh->width;
+ st->codecpar->height = dsh->height;
+ st->codecpar->format = dsh->pix_fmt;
+ st->codecpar->color_range = dsh->color_range;
+ st->codecpar->color_trc = dsh->color_trc;
+ st->codecpar->color_primaries = dsh->color_primaries;
+ st->codecpar->color_space = dsh->colorspace;
+ st->codecpar->profile = dsh->profile;
+ st->codecpar->level = dsh->level;
// dirac in ogg always stores timestamps as though the video were
interlaced
avpriv_set_pts_info(st, 64, dsh->framerate.den, 2 * dsh->framerate.num);
@@ -91,8 +91,8 @@ static int old_dirac_header(AVFormatContext *s, int idx)
if (buf[0] != 'K')
return 0;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = AV_CODEC_ID_DIRAC;
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = AV_CODEC_ID_DIRAC;
avpriv_set_pts_info(st, 64, AV_RB32(buf+12), AV_RB32(buf+8));
return 1;
}
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
