Merge commit '32c8359093d1ff4f45ed19518b449b3ac3769d27'

[ffmpeg] / libavformat / oggparsevp8.c

diff --git a/libavformat/oggparsevp8.c b/libavformat/oggparsevp8.c
index d57419e9f08bb37f3f5c364652073a2c420f9a2e..6716dd2f4580f4e06cefb8472df2c558528ecb3f 100644 (file)
--- a/libavformat/oggparsevp8.c
+++ b/libavformat/oggparsevp8.c
@@ -82,7 +82,11 @@ static uint64_t vp8_gptopts(AVFormatContext *s, int idx,
     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)