- p++;
-
- if(*p == 'v'){
- int tag;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- p += 8;
- tag = bytestream_get_le32(&p);
- st->codec->codec_id = codec_get_id(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;
- } else {
- uint8_t acid[5];
- int cid;
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- p += 8;
- bytestream_get_buffer(&p, acid, 4);
- acid[4] = 0;
- cid = strtol(acid, NULL, 16);
- st->codec->codec_id = codec_get_id(codec_wav_tags, cid);
- }
-
- p += 4; /* useless size field */
-
- time_unit = bytestream_get_le64(&p);
- spu = bytestream_get_le64(&p);
- default_len = bytestream_get_le32(&p);
-
- p += 8; /* buffersize + bits_per_sample */
-
- if(st->codec->codec_type == CODEC_TYPE_VIDEO){
- st->codec->width = bytestream_get_le32(&p);
- st->codec->height = bytestream_get_le32(&p);
- st->codec->time_base.den = spu * 10000000;
- st->codec->time_base.num = time_unit;
- st->time_base = st->codec->time_base;
- } else {
- st->codec->channels = bytestream_get_le16(&p);
- p += 2; /* block_align */
- st->codec->bit_rate = bytestream_get_le32(&p) * 8;
- st->codec->sample_rate = spu * 10000000 / time_unit;
- st->time_base.num = 1;
- st->time_base.den = st->codec->sample_rate;
+ if (bytestream2_peek_byte(&p) == 1) {
+ bytestream2_skip(&p, 1);
+
+ if (bytestream2_peek_byte(&p) == 'v'){
+ int tag;
+ st->codec->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;
+ } else if (bytestream2_peek_byte(&p) == 't') {
+ st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
+ st->codec->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;
+ 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->need_parsing = AVSTREAM_PARSE_FULL;
+ }
+
+ bytestream2_skip(&p, 4); /* useless size field */
+
+ time_unit = bytestream2_get_le64(&p);
+ spu = bytestream2_get_le64(&p);
+ if (!time_unit || !spu) {
+ av_log(s, AV_LOG_ERROR, "Invalid timing values.\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ 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);
+ avpriv_set_pts_info(st, 64, time_unit, spu * 10000000);
+ } else {
+ st->codec->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);
+ }
+ } else if (bytestream2_peek_byte(&p) == 3) {
+ bytestream2_skip(&p, 7);
+ if (bytestream2_get_bytes_left(&p) > 1)
+ ff_vorbis_comment(s, &st->metadata, p.buffer, bytestream2_get_bytes_left(&p) - 1, 1);