From 56291434335c56fd436646338e5088c2c90b81bb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 13 Sep 2015 13:53:05 +0200 Subject: [PATCH] avformat/flvdec: Use the first index entry to find the first packet if there was a parsing error in the header Fixes: unknow_codec.flv Signed-off-by: Michael Niedermayer --- libavformat/flvdec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 148c5be4a3..826e0d7ea2 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -854,6 +854,13 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) meta_pos = avio_tell(s->pb); type = flv_read_metabody(s, next); if (type == 0 && dts == 0 || type < 0 || type == TYPE_UNKNOWN) { + if (type < 0 && flv->validate_count && + flv->validate_index[0].pos > next && + flv->validate_index[0].pos - 4 < next + ) { + av_log(s, AV_LOG_WARNING, "Adjusting next position due to index mismatch\n"); + next = flv->validate_index[0].pos - 4; + } goto skip; } else if (type == TYPE_ONTEXTDATA) { avpriv_request_sample(s, "OnTextData packet");