aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-06-06 14:30:40 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-13 13:08:57 +0200
commit76a239768f630b4766fd3be71f7d465eeeda1d79 (patch)
treea34b3b92b18f46e29234d8d4e7eaaeb931d727ef
parentfca62cc6a709a80384673ab97654a79b43f7e98c (diff)
downloadandroid_external_ffmpeg-76a239768f630b4766fd3be71f7d465eeeda1d79.tar.gz
android_external_ffmpeg-76a239768f630b4766fd3be71f7d465eeeda1d79.tar.bz2
android_external_ffmpeg-76a239768f630b4766fd3be71f7d465eeeda1d79.zip
avcodec/bmp_parser: reset state
Fixes part of ticket 5598 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 37005e65eb17b1480d9e1755eeba3f50ee3b9555) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/bmp_parser.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c
index 8111ada6f2..d2a04ef69b 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++;
}