[FFmpeg-cvslog] avformat/flvdec: Accept last size if its off by 1
Michael Niedermayer
git at videolan.org
Sat Aug 13 16:30:02 EEST 2016
ffmpeg | branch: release/3.0 | Michael Niedermayer <michael at niedermayer.cc> | Tue Jun 21 23:38:23 2016 +0200| [13b6852225847bf2a340d94afa4db4343970d2e6] | committer: Michael Niedermayer
avformat/flvdec: Accept last size if its off by 1
Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit e8931d79cc4d3a807860c0d4a223a77b149d2e9e)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13b6852225847bf2a340d94afa4db4343970d2e6
---
libavformat/flvdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 5090ac2..03bbf98 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -1144,7 +1144,7 @@ retry_duration:
leave:
last = avio_rb32(s->pb);
- if (last != orig_size + 11 &&
+ if (last != orig_size + 11 && last != orig_size + 10 &&
(last != orig_size || !last) && last != flv->sum_flv_tag_size &&
!flv->broken_sizes) {
av_log(s, AV_LOG_ERROR, "Packet mismatch %d %d\n", last, orig_size + 11);
More information about the ffmpeg-cvslog
mailing list