aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-06-06 14:27:20 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-15 18:54:34 +0200
commit591c0b527c50b9910dc2d6f475a66ee5c1b7fd77 (patch)
treeb630a8f654a1aeafb9b11f4e5fdf80d931e612ed
parent731848ef80838397f8e9281a6c89d9fe30da77e0 (diff)
downloadffmpeg-591c0b527c50b9910dc2d6f475a66ee5c1b7fd77.tar.gz
avcodec/bmp_parser: Fix remaining size
Fixes part of ticket 5598 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 250b620d296adba7bd3a3104a9c30e820fb0bc36) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/bmp_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c
index c9fe153de1..8111ada6f2 100644
--- a/libavcodec/bmp_parser.c
+++ b/libavcodec/bmp_parser.c
@@ -63,7 +63,7 @@ restart:
continue;
}
bpc->pc.frame_start_found++;
- bpc->remaining_size = bpc->fsize + FFMAX(i - 17, 0);
+ bpc->remaining_size = bpc->fsize + i - 17;
if (bpc->pc.index + i > 17) {
next = i - 17;