RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-01 20:42:19 +00:00
Code Issues Projects Releases Wiki Activity

avformat/oggdec: dont read timestamps from EOS pages of ogm videos

Browse Source 
Some muxers store invalid timestamps there, which breaks seeking
Fixes Ticket2739

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-04 17:33:59 +01:00
parent 863f4c3c71
commit 5e0c7eab2a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/oggdec.c
View File

@ -808,6 +808,11 @@ static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
&& !ogg_packet(s, &i, &pstart, &psize, pos_arg)) { && !ogg_packet(s, &i, &pstart, &psize, pos_arg)) {
if (i == stream_index) { if (i == stream_index) {
struct ogg_stream *os = ogg->streams + stream_index; struct ogg_stream *os = ogg->streams + stream_index;
// Dont trust the last timestamps of a ogm video
if ( (os->flags & OGG_FLAG_EOS)
&& !(os->flags & OGG_FLAG_BOS)
&& os->codec == &ff_ogm_video_codec)
continue;
pts = ogg_calc_pts(s, i, NULL); pts = ogg_calc_pts(s, i, NULL);
ogg_validate_keyframe(s, i, pstart, psize); ogg_validate_keyframe(s, i, pstart, psize);
if (os->pflags & AV_PKT_FLAG_KEY) { if (os->pflags & AV_PKT_FLAG_KEY) {