[FFmpeg-cvslog] avcodec/bmp_parser: reset state

Michael Niedermayer git at videolan.org
Sat Aug 13 16:29:59 EEST 2016


ffmpeg | branch: release/3.0 | Michael Niedermayer <michael at niedermayer.cc> | Mon Jun  6 14:30:40 2016 +0200| [76a239768f630b4766fd3be71f7d465eeeda1d79] | committer: Michael Niedermayer

avcodec/bmp_parser: reset state

Fixes part of ticket 5598

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

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

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

 libavcodec/bmp_parser.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c
index 8111ada..d2a04ef 100644
--- a/libavcodec/bmp_parser.c
+++ b/libavcodec/bmp_parser.c
@@ -69,8 +69,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++;
         }



More information about the ffmpeg-cvslog mailing list