From cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Tue, 26 May 2015 14:24:37 +0100 Subject: [PATCH] mov: reject zero bytes_per_frame with non-zero samples_per_frame In this case the mov demuxer can return a large number of empty packets. Signed-off-by: Andreas Cadhalpun Signed-off-by: Luca Barbato --- libavformat/mov.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index fbbfef0bf3..2cf6e8e540 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2263,6 +2263,13 @@ static void mov_build_index(MOVContext *mov, AVStream *st) AVIndexEntry *e; unsigned size, samples; + if (sc->samples_per_frame > 1 && !sc->bytes_per_frame) { + avpriv_request_sample(mov->fc, + "Zero bytes per frame, but %d samples per frame", + sc->samples_per_frame); + return; + } + if (sc->samples_per_frame >= 160) { // gsm samples = sc->samples_per_frame; size = sc->bytes_per_frame; -- 2.11.0