avcodec/bmp_parser: Fix frame_start_found in cross frame cases

Fixes part of ticket 5598 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago · bfe945ac3a
parent b5bc436ebc
commit bfe945ac3a
1 changed files with 4 additions and 1 deletions
--- a/libavcodec/bmp_parser.c
+++ b/libavcodec/bmp_parser.c
@ -91,7 +91,10 @@ flush:
    if (ff_combine_frame(&bpc->pc, next, &buf, &buf_size) < 0)
        return buf_size;

-    bpc->pc.frame_start_found = 0;
+    if (next != END_NOT_FOUND && next < 0)
+        bpc->pc.frame_start_found = FFMAX(bpc->pc.frame_start_found - i - 1, 0);
+    else
+        bpc->pc.frame_start_found = 0;

    *poutbuf      = buf;
    *poutbuf_size = buf_size;