virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avformat/oggparsedaala: Do not adjust AV_NOPTS_VALUE

Browse Source 
Fixes: potential signed integer overflow

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f655ddfb47)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-03-08 17:28:36 +01:00
parent e61cdbe271
commit 3a29fda42a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/oggparsedaala.c
View File

@ -218,6 +218,7 @@ static int daala_packet(AVFormatContext *s, int idx)
int seg, duration = 1;
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + idx;
int64_t pts;
/*
* first packet handling: here we parse the duration of each packet in the
@ -230,7 +231,10 @@ static int daala_packet(AVFormatContext *s, int idx)
if (os->segments[seg] < 255)
duration++;
os->lastpts = os->lastdts = daala_gptopts(s, idx, os->granule, NULL) - duration;
pts = daala_gptopts(s, idx, os->granule, NULL);
if (pts != AV_NOPTS_VALUE)
pts -= duration;
os->lastpts = os->lastdts = pts;
if(s->streams[idx]->start_time == AV_NOPTS_VALUE) {
s->streams[idx]->start_time = os->lastpts;
if (s->streams[idx]->duration != AV_NOPTS_VALUE)