Commit 7d0e927a authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mpegts: fix resync seek

The seek ended up seeking before the begin, which caused problems
Fixes initial sync issues with libbluray
Fixes Ticket3117
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent cbefb3d9
...@@ -1993,7 +1993,9 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size, co ...@@ -1993,7 +1993,9 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size, co
/* check packet sync byte */ /* check packet sync byte */
if ((*data)[0] != 0x47) { if ((*data)[0] != 0x47) {
/* find a new packet start */ /* find a new packet start */
avio_seek(pb, -raw_packet_size, SEEK_CUR); uint64_t pos = avio_tell(pb);
avio_seek(pb, -FFMIN(raw_packet_size, pos), SEEK_CUR);
if (mpegts_resync(s) < 0) if (mpegts_resync(s) < 0)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment