diff options
| author | James Almer <jamrial@gmail.com> | 2016-07-12 17:05:42 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-07-25 09:59:25 -0300 |
| commit | 5141a0ceafd34a68723da1940a410cfacf116110 (patch) | |
| tree | 4cc504d33643faf2387a141bb1fb9d4d7de83166 | |
| parent | 95a8dace5cc70ad94f0820ed9fb9679276a385e9 (diff) | |
| download | ffmpeg-5141a0ceafd34a68723da1940a410cfacf116110.tar.gz | |
avformat/oggparsevp8: fix pts calculation on pages ending with an invisible frame
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 5adfbd391847fcdaea1e9b105fae2dd90af2a733)
| -rw-r--r-- | libavformat/oggparsevp8.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/oggparsevp8.c b/libavformat/oggparsevp8.c index 5959d32b6a..7c67cc55a3 100644 --- a/libavformat/oggparsevp8.c +++ b/libavformat/oggparsevp8.c @@ -79,7 +79,11 @@ static uint64_t vp8_gptopts(AVFormatContext *s, int idx, uint64_t granule, int64 struct ogg *ogg = s->priv_data; struct ogg_stream *os = ogg->streams + idx; - uint64_t pts = (granule >> 32); + int invcnt = !((granule >> 30) & 3); + // If page granule is that of an invisible vp8 frame, its pts will be + // that of the end of the next visible frame. We substract 1 for those + // to prevent messing up pts calculations. + uint64_t pts = (granule >> 32) - invcnt; uint32_t dist = (granule >> 3) & 0x07ffffff; if (!dist) |