diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-06 14:27:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-13 13:08:57 +0200 |
| commit | fca62cc6a709a80384673ab97654a79b43f7e98c (patch) | |
| tree | b044e8de4981ab173f8726bbc89bda74c3bc6558 | |
| parent | 9f1e8b4fb28f92f624bc2da431f438dfe43c7332 (diff) | |
| download | android_external_ffmpeg-fca62cc6a709a80384673ab97654a79b43f7e98c.tar.gz android_external_ffmpeg-fca62cc6a709a80384673ab97654a79b43f7e98c.tar.bz2 android_external_ffmpeg-fca62cc6a709a80384673ab97654a79b43f7e98c.zip | |
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.c | 2 |
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; |