virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

avformat/utils: reorder operations in update_wrap_reference()

Browse Source 
prevents a integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-04 14:29:35 +01:00
parent f1783c05f1
commit 34b16e2d36
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/utils.c
View File

@ -887,12 +887,11 @@ static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_in
if (ref == AV_NOPTS_VALUE) if (ref == AV_NOPTS_VALUE)
ref = pkt->pts; ref = pkt->pts;
if (ref == AV_NOPTS_VALUE) if (st->pts_wrap_reference != AV_NOPTS_VALUE || st->pts_wrap_bits >= 63 || ref == AV_NOPTS_VALUE || !s->correct_ts_overflow)
return 0; return 0;
ref &= (1LL<<st->pts_wrap_bits)-1; ref &= (1LL<<st->pts_wrap_bits)-1;
if (s->correct_ts_overflow && st->pts_wrap_bits < 63 && {
st->pts_wrap_reference == AV_NOPTS_VALUE) {
int i; int i;
// reference time stamp should be 60 s before first time stamp // reference time stamp should be 60 s before first time stamp
@ -945,7 +944,6 @@ static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_in
} }
return 1; return 1;
} }
return 0;
} }
static void update_initial_timestamps(AVFormatContext *s, int stream_index, static void update_initial_timestamps(AVFormatContext *s, int stream_index,