ffmpeg | branch: release/2.4 | Michael Niedermayer <mich...@niedermayer.cc> |
Tue Jan 5 01:06:18 2016 +0100| [8158fb129e159d594d85ed8ef58ac609088e19cd] |
committer: Michael Niedermayer
avcodec/h264_slice: Fix integer overflow in implicit weight computation
Fixes mozilla bug 1230423
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 7cc01c25727a96eaaa0c177234b626e47c8ea491)
Conflicts:
libavcodec/h264_slice.c
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8158fb129e159d594d85ed8ef58ac609088e19cd
---
libavcodec/h264_slice.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 0389094..e0a25b7 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -927,7 +927,7 @@ static void implicit_weight_table(H264Context *h, int field)
cur_poc = h->cur_pic_ptr->field_poc[h->picture_structure - 1];
}
if (h->ref_count[0] == 1 && h->ref_count[1] == 1 && !FRAME_MBAFF(h) &&
- h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2 * cur_poc) {
+ h->ref_list[0][0].poc + (int64_t)h->ref_list[1][0].poc == 2 *
cur_poc) {
h->use_weight = 0;
h->use_weight_chroma = 0;
return;
@@ -948,7 +948,7 @@ static void implicit_weight_table(H264Context *h, int field)
h->chroma_log2_weight_denom = 5;
for (ref0 = ref_start; ref0 < ref_count0; ref0++) {
- int poc0 = h->ref_list[0][ref0].poc;
+ int64_t poc0 = h->ref_list[0][ref0].poc;
for (ref1 = ref_start; ref1 < ref_count1; ref1++) {
int w = 32;
if (!h->ref_list[0][ref0].long_ref &&
!h->ref_list[1][ref1].long_ref) {
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
