virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

flvdec: A little bit of cleanup

Browse Source
This commit is contained in:
Joseph Wecker 2011-08-26 17:50:33 -07:00 committed by Michael Niedermayer
parent 4ee53d7e86
commit 0078430e30
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/flvdec.c
View File

@ -414,17 +414,16 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if ((flags & 0xf0) == 0x50) /* video info / command frame */
goto skip;
} else if (type == FLV_TAG_TYPE_META) {
if (size > 13+1+4 && dts == 0) {
// Header-type metadata stuff
if (size > 13+1+4 && dts == 0) { // Header-type metadata stuff
flv_read_metabody(s, next);
goto skip;
} else if (dts != 0) {
// Script-data "special" metadata frames - don't skip
} else if (dts != 0) { // Script-data "special" metadata frames - don't skip
stream_type=FLV_STREAM_TYPE_DATA;
} else {
goto skip;
}
} else {
av_log(s, AV_LOG_DEBUG, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags);
skip:
avio_seek(s->pb, next, SEEK_SET);
continue;
@ -541,7 +540,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->stream_index = st->index;
if ( stream_type == FLV_STREAM_TYPE_AUDIO ||
(flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY ||
((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) ||
stream_type == FLV_STREAM_TYPE_DATA)
pkt->flags |= AV_PKT_FLAG_KEY;