aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-06-22 20:19:40 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-08-13 13:08:57 +0200
commit96ce6f64cc33e7d599d9b98e15d9fc2e3e28cb69 (patch)
treef7bd3cb3b639014ce3f41b798689e3116da687d3
parent13b6852225847bf2a340d94afa4db4343970d2e6 (diff)
downloadandroid_external_ffmpeg-96ce6f64cc33e7d599d9b98e15d9fc2e3e28cb69.tar.gz
android_external_ffmpeg-96ce6f64cc33e7d599d9b98e15d9fc2e3e28cb69.tar.bz2
android_external_ffmpeg-96ce6f64cc33e7d599d9b98e15d9fc2e3e28cb69.zip
avcodec/flac_parser: Raise threshold for detecting invalid data
Fixes regression from Ticket5428 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b0b3676e136a09a13767859f429a0aa416d929cd) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/flac_parser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c
index 3723716441..183fe6e5c9 100644
--- a/libavcodec/flac_parser.c
+++ b/libavcodec/flac_parser.c
@@ -617,8 +617,8 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
if (!av_fifo_space(fpc->fifo_buf) &&
av_fifo_size(fpc->fifo_buf) / FLAC_AVG_FRAME_SIZE >
- fpc->nb_headers_buffered * 10) {
- /* There is less than one valid flac header buffered for 10 headers
+ fpc->nb_headers_buffered * 20) {
+ /* There is less than one valid flac header buffered for 20 headers
* buffered. Therefore the fifo is most likely filled with invalid
* data and the input is not a flac file. */
goto handle_error;