aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-06-21 23:38:23 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-13 13:08:57 +0200
commit13b6852225847bf2a340d94afa4db4343970d2e6 (patch)
tree78f233ce0b0becd0c6cd19c000d3ae09ef365c21
parentd13ba3960659fc54a459769d656531ac65ba1511 (diff)
downloadandroid_external_ffmpeg-13b6852225847bf2a340d94afa4db4343970d2e6.tar.gz
android_external_ffmpeg-13b6852225847bf2a340d94afa4db4343970d2e6.tar.bz2
android_external_ffmpeg-13b6852225847bf2a340d94afa4db4343970d2e6.zip
avformat/flvdec: Accept last size if its off by 1
Fixes part of Ticket5648 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e8931d79cc4d3a807860c0d4a223a77b149d2e9e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/flvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 5090ac2157..03bbf98d5e 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);