summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale Curtis <dalecurtis@chromium.org>2017-11-28 14:26:55 -0800
committerMichael Niedermayer <michael@niedermayer.cc>2017-12-02 00:14:19 +0100
commitb40b3ddcfcd114f6e67de6e05c3afd77d5de8406 (patch)
treec52b86a2ddd437ae02108f5239f711c36b822a56
parent17bfddeb399b3fed1ccacd1d9b0d2ca65cee1041 (diff)
downloadffmpeg-b40b3ddcfcd114f6e67de6e05c3afd77d5de8406.tar.gz
Don't manipulate duration when it's AV_NOPTS_VALUE.
This leads to signed integer overflow. Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit c5fd57f483d2ad8e34551b78509f1e14136f73c0) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/oggparsevp8.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparsevp8.c b/libavformat/oggparsevp8.c
index 5959d32b6a..e3ca775d22 100644
--- a/libavformat/oggparsevp8.c
+++ b/libavformat/oggparsevp8.c
@@ -116,7 +116,7 @@ static int vp8_packet(AVFormatContext *s, int idx)
os->lastpts = os->lastdts = vp8_gptopts(s, idx, os->granule, NULL) - duration;
if(s->streams[idx]->start_time == AV_NOPTS_VALUE) {
s->streams[idx]->start_time = os->lastpts;
- if (s->streams[idx]->duration)
+ if (s->streams[idx]->duration && s->streams[idx]->duration != AV_NOPTS_VALUE)
s->streams[idx]->duration -= s->streams[idx]->start_time;
}
}