diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-06 14:01:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-13 13:08:57 +0200 |
| commit | 9f1e8b4fb28f92f624bc2da431f438dfe43c7332 (patch) | |
| tree | cf406e22fb6d08c5076f06affcc679f5bf801735 | |
| parent | b2a2b1a88b3e3c78e8732bceab717910bd3eba09 (diff) | |
| download | android_external_ffmpeg-9f1e8b4fb28f92f624bc2da431f438dfe43c7332.tar.gz android_external_ffmpeg-9f1e8b4fb28f92f624bc2da431f438dfe43c7332.tar.bz2 android_external_ffmpeg-9f1e8b4fb28f92f624bc2da431f438dfe43c7332.zip | |
avcodec/bmp_parser: Fix frame_start_found in cross frame cases
Fixes part of ticket 5598
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit bfe945ac3a0c328371dc4b4cc3409b7da5784cb8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/bmp_parser.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c index b06e3e84ef..c9fe153de1 100644 --- 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; |