generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/flvdec: re enable flv_data_packet()

Browse Source 
Found-by: kurosu
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-20 23:56:17 +01:00
parent 7869b2959d
commit 1df64d6c46
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/flvdec.c
View File

@ -830,10 +830,15 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
goto skip; goto skip;
} else if (type == FLV_TAG_TYPE_META) { } else if (type == FLV_TAG_TYPE_META) {
stream_type=FLV_STREAM_TYPE_DATA; stream_type=FLV_STREAM_TYPE_DATA;
if (size > 13 + 1 + 4 && dts == 0) { // Header-type metadata stuff if (size > 13 + 1 + 4) { // Header-type metadata stuff
int type;
meta_pos = avio_tell(s->pb); meta_pos = avio_tell(s->pb);
if (flv_read_metabody(s, next) <= 0) { type = flv_read_metabody(s, next);
if (type == 0 && dts == 0 || type < 0) {
goto skip; goto skip;
} else if (type == TYPE_ONTEXTDATA) {
avpriv_request_sample(s, "OnTextData packet");
return flv_data_packet(s, pkt, dts, next);
} }
avio_seek(s->pb, meta_pos, SEEK_SET); avio_seek(s->pb, meta_pos, SEEK_SET);
} }