RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-09-13 13:53:05 +02:00
parent fd6296e412
commit 5629143433
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/flvdec.c
View File

@ -854,6 +854,13 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
meta_pos = avio_tell(s->pb); meta_pos = avio_tell(s->pb);
type = flv_read_metabody(s, next); type = flv_read_metabody(s, next);
if (type == 0 && dts == 0 || type < 0 || type == TYPE_UNKNOWN) { 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; goto skip;
} else if (type == TYPE_ONTEXTDATA) { } else if (type == TYPE_ONTEXTDATA) {
avpriv_request_sample(s, "OnTextData packet"); avpriv_request_sample(s, "OnTextData packet");