RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 10:15:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix flvdec start-of-frame.

Browse Source 
Patch by Howard Chu hyc highlandsun com

Originally committed as revision 22757 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Howard Chu 2010-04-01 08:02:20 +00:00 committed by Benoit Fouet
parent cf097cbc0b
commit 527c2e6429
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/flvdec.c
View File

@ -270,6 +270,7 @@ static int flv_read_header(AVFormatContext *s,
offset = get_be32(s->pb); offset = get_be32(s->pb);
url_fseek(s->pb, offset, SEEK_SET); url_fseek(s->pb, offset, SEEK_SET);
url_fskip(s->pb, 4);
s->start_time = 0; s->start_time = 0;
@ -295,9 +296,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
int64_t dts, pts = AV_NOPTS_VALUE; int64_t dts, pts = AV_NOPTS_VALUE;
AVStream *st = NULL; AVStream *st = NULL;
for(;;){ for(;;url_fskip(s->pb, 4)){ /* pkt size is repeated at end. skip it */
pos = url_ftell(s->pb); pos = url_ftell(s->pb);
url_fskip(s->pb, 4); /* size of previous packet */
type = get_byte(s->pb); type = get_byte(s->pb);
size = get_be24(s->pb); size = get_be24(s->pb);
dts = get_be24(s->pb); dts = get_be24(s->pb);
@ -417,13 +417,16 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
st->codec->channels, st->codec->sample_rate); st->codec->channels, st->codec->sample_rate);
} }
return AVERROR(EAGAIN); ret = AVERROR(EAGAIN);
goto leave;
} }
} }
/* skip empty data packets */ /* skip empty data packets */
if (!size) if (!size) {
return AVERROR(EAGAIN); ret = AVERROR(EAGAIN);
goto leave;
}
ret= av_get_packet(s->pb, pkt, size); ret= av_get_packet(s->pb, pkt, size);
if (ret < 0) { if (ret < 0) {
@ -439,6 +442,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)) if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY))
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
leave:
url_fskip(s->pb, 4);
return ret; return ret;
} }