summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-04 16:17:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-04 17:56:37 +0200
commite2e0c5b7f64d526907955b27e5682c8bf4de7700 (patch)
treeb6d325e77120abd67b19be4e4e87b9e2ce216788
parent279003eb9edeeaa3967b8773cc85ecb8a19b53a8 (diff)
downloadffmpeg-e2e0c5b7f64d526907955b27e5682c8bf4de7700.tar.gz
avcodec/hevc: fix chroma transform_add size
Fixes accessing misaligned address Fixes: signal_sigsegv_1feb99c_10_signal_sigsegv_2d1d35c_79_cov_691940146_EXT_A_ericsson_3.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit df8394c693d3c1e13b7ebf6af01c5e55321cf952) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hevc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index afb2baaf65..3fb8a8a3cf 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -978,7 +978,7 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0,
for (i = 0; i < (size * size); i++) {
coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3);
}
- s->hevcdsp.transform_add[log2_trafo_size-2](dst, coeffs, stride);
+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride);
}
}
@@ -1007,7 +1007,7 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0,
for (i = 0; i < (size * size); i++) {
coeffs[i] = ((lc->tu.res_scale_val * coeffs_y[i]) >> 3);
}
- s->hevcdsp.transform_add[log2_trafo_size-2](dst, coeffs, stride);
+ s->hevcdsp.transform_add[log2_trafo_size_c-2](dst, coeffs, stride);
}
}
} else if (blk_idx == 3) {