virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity

sbgdec: prevent NULL pointer access

Browse Source 
Reviewed-by: Josh de Kock <josh@itanimul.li>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit dbefbb61b7)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2016-11-10 22:21:20 +01:00
parent 8a7b2fbf6f
commit 22cd4aa221
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/sbgdec.c
View File

@ -927,7 +927,7 @@ static void expand_timestamps(void *log, struct sbg_script *s)
}
}
if (s->start_ts == AV_NOPTS_VALUE)
s->start_ts = s->opt_start_at_first ? s->tseq[0].ts.t : now;
s->start_ts = (s->opt_start_at_first && s->tseq) ? s->tseq[0].ts.t : now;
s->end_ts = s->opt_duration ? s->start_ts + s->opt_duration :
AV_NOPTS_VALUE; /* may be overridden later by -E option */
cur_ts = now;