Merge commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0'

[ffmpeg] / libavcodec / bmp_parser.c

diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c
index c9493dc32d892f77e248f9bd954d0e17cb38137c..7ab32a0b006c522b70d648b9669260d0a1c09b88 100644 (file)
--- 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 + i - 17;
+                bpc->remaining_size = bpc->fsize + FFMAX(i - 17, 0);
 
                 if (bpc->pc.index + i > 17) {
                     next = i - 17;