avcodec/sheervideo: fix prediction for ybyr format

[ffmpeg] / libavcodec / bmp_parser.c

diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c
index 8111ada6f26add87d9180d2aea5a2e131824b4c4..cd65f02a2e0c82901cb69a371f1f2532f93b5bcf 100644 (file)
--- a/libavcodec/bmp_parser.c
+++ b/libavcodec/bmp_parser.c
@@ -53,7 +53,8 @@ restart:
             if (bpc->pc.frame_start_found == 0) {
                 if ((state >> 48) == (('B' << 8) | 'M')) {
                     bpc->fsize = av_bswap32(state >> 16);
-                    bpc->pc.frame_start_found = 1;
+                    if (bpc->fsize > 17)
+                        bpc->pc.frame_start_found = 1;
                 }
             } else if (bpc->pc.frame_start_found == 2+4+4) {
 //                 unsigned hsize = av_bswap32(state>>32);
@@ -69,8 +70,10 @@ restart:
                     next = i - 17;
                     state = 0;
                     break;
-                } else
+                } else {
+                    bpc->pc.state64 = 0;
                     goto restart;
+                }
             } else if (bpc->pc.frame_start_found)
                 bpc->pc.frame_start_found++;
         }