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:
5537c92
)
ff_convert_matrix: fix integer overflow
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 18 Oct 2012 19:51:04 +0000
(21:51 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 18 Oct 2012 19:51:04 +0000
(21:51 +0200)
Fixes CID608053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo_enc.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo_enc.c
b/libavcodec/mpegvideo_enc.c
index
32e1772
..
d777072
100644
(file)
--- a/
libavcodec/mpegvideo_enc.c
+++ b/
libavcodec/mpegvideo_enc.c
@@
-103,7
+103,7
@@
void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64],
* 3444240 >= (1 << 36) / (x) >= 275 */
qmat[qscale][i] = (int)((UINT64_C(1) << (QMAT_SHIFT + 14)) /
- (ff_aanscales[i] * qscale * quant_matrix[j]));
+ (ff_aanscales[i] *
(int64_t)
qscale * quant_matrix[j]));
}
} else {
for (i = 0; i < 64; i++) {