- st->codec->codec_type = CODEC_TYPE_VIDEO;
- p += 8;
- tag = bytestream_get_le32(&p);
- st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
- st->codec->codec_tag = tag;
- } else if (*p == 't') {
- st->codec->codec_type = CODEC_TYPE_SUBTITLE;
- st->codec->codec_id = CODEC_ID_TEXT;
- p += 12;
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ bytestream2_skip(&p, 8);
+ tag = bytestream2_get_le32(&p);
+ 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->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
+ st->codecpar->codec_id = AV_CODEC_ID_TEXT;
+ bytestream2_skip(&p, 12);