[FFmpeg-cvslog] avcodec/bmp_parser: Fix remaining size

[Michael Niedermayer]

ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Mon Jun  6 14:27:20 2016 +0200| [591c0b527c50b9910dc2d6f475a66ee5c1b7fd77] | committer: Michael Niedermayer

avcodec/bmp_parser: Fix remaining size

Fixes part of ticket 5598

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 250b620d296adba7bd3a3104a9c30e820fb0bc36)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=591c0b527c50b9910dc2d6f475a66ee5c1b7fd77
---

 libavcodec/bmp_parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c
index c9fe153..8111ada 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;