- int64_t end = avio_tell(pb) + tlen;
- uint8_t *b;
-
- b = buffer;
- while (avio_tell(pb) < end && b - buffer < tlen && !pb->eof_reached) {
- *b++ = avio_r8(pb);
- if (*(b - 1) == 0xff && avio_tell(pb) < end - 1 &&
- b - buffer < tlen &&
- !pb->eof_reached ) {
- uint8_t val = avio_r8(pb);
- *b++ = val ? val : avio_r8(pb);
- }
+ uint8_t *b = buffer;
+ uint8_t *t = buffer;
+ uint8_t *end = t + tlen;
+
+ if (avio_read(pb, buffer, tlen) != tlen) {
+ av_log(s, AV_LOG_ERROR, "Failed to read tag data\n");
+ goto seek;