OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3403056
)
nut: fix int32 overflow
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 16 Oct 2012 17:59:01 +0000
(19:59 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 16 Oct 2012 17:59:01 +0000
(19:59 +0200)
Fixes CID700574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/nut.c
patch
|
blob
|
history
diff --git
a/libavformat/nut.c
b/libavformat/nut.c
index
34c43d1
..
51e4d38
100644
(file)
--- a/
libavformat/nut.c
+++ b/
libavformat/nut.c
@@
-155,7
+155,7
@@
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
}
int64_t ff_lsb2full(StreamContext *stream, int64_t lsb){
- int64_t mask = (1<<stream->msb_pts_shift)-1;
+ int64_t mask = (1
ULL
<<stream->msb_pts_shift)-1;
int64_t delta= stream->last_pts - mask/2;
return ((lsb - delta)&mask) + delta;
}