git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
5c57e2b
)
avformat/oggparsevorbis: Dont attempt to calculate timestamps from gp=0
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 11 Jun 2014 16:03:45 +0000
(18:03 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 11 Jun 2014 16:12:14 +0000
(18:12 +0200)
Fixes Ticket3710
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/oggparsevorbis.c
patch
|
blob
|
history
diff --git
a/libavformat/oggparsevorbis.c
b/libavformat/oggparsevorbis.c
index
51c5eb3
..
8103d9d
100644
(file)
--- a/
libavformat/oggparsevorbis.c
+++ b/
libavformat/oggparsevorbis.c
@@
-427,6
+427,10
@@
static int vorbis_packet(AVFormatContext *s, int idx)
}
os->lastpts =
os->lastdts = os->granule - duration;
+
+ if (!os->granule && duration) //hack to deal with broken files (Ticket3710)
+ os->lastpts = os->lastdts = AV_NOPTS_VALUE;
+
if (s->streams[idx]->start_time == AV_NOPTS_VALUE) {
s->streams[idx]->start_time = FFMAX(os->lastpts, 0);
if (s->streams[idx]->duration != AV_NOPTS_VALUE)