summaryrefslogtreecommitdiff
path: root/libavcodec/h264_mc_template.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-27 15:53:33 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:15 +0100
commit6490a0c0fbe0e55f765ea2aa2e8495181ea1f719 (patch)
tree707fd334fb99c5a24a14858673d9113ebfd367f2 /libavcodec/h264_mc_template.c
parent51822879e7732ee8175dad98dde1a135f6e5c1a4 (diff)
h264_mb: constify all uses of H264Context
All the variables modified by this code are either per-MB arrays or have been moved to the per-slice context
Diffstat (limited to 'libavcodec/h264_mc_template.c')
-rw-r--r--libavcodec/h264_mc_template.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c
index f1f906f729..a2958598ab 100644
--- a/libavcodec/h264_mc_template.c
+++ b/libavcodec/h264_mc_template.c
@@ -34,18 +34,18 @@
#undef mc_part
#define mc_part MCFUNC(mc_part)
-static void mc_part(H264Context *h, H264SliceContext *sl,
+static void mc_part(const H264Context *h, H264SliceContext *sl,
int n, int square,
int height, int delta,
uint8_t *dest_y, uint8_t *dest_cb,
uint8_t *dest_cr,
int x_offset, int y_offset,
- qpel_mc_func *qpix_put,
+ const qpel_mc_func *qpix_put,
h264_chroma_mc_func chroma_put,
- qpel_mc_func *qpix_avg,
+ const qpel_mc_func *qpix_avg,
h264_chroma_mc_func chroma_avg,
- h264_weight_func *weight_op,
- h264_biweight_func *weight_avg,
+ const h264_weight_func *weight_op,
+ const h264_biweight_func *weight_avg,
int list0, int list1)
{
if ((sl->use_weight == 2 && list0 && list1 &&
@@ -61,15 +61,15 @@ static void mc_part(H264Context *h, H264SliceContext *sl,
chroma_avg, list0, list1, PIXEL_SHIFT, CHROMA_IDC);
}
-static void MCFUNC(hl_motion)(H264Context *h, H264SliceContext *sl,
+static void MCFUNC(hl_motion)(const H264Context *h, H264SliceContext *sl,
uint8_t *dest_y,
uint8_t *dest_cb, uint8_t *dest_cr,
qpel_mc_func(*qpix_put)[16],
- h264_chroma_mc_func(*chroma_put),
+ const h264_chroma_mc_func(*chroma_put),
qpel_mc_func(*qpix_avg)[16],
- h264_chroma_mc_func(*chroma_avg),
- h264_weight_func *weight_op,
- h264_biweight_func *weight_avg)
+ const h264_chroma_mc_func(*chroma_avg),
+ const h264_weight_func *weight_op,
+ const h264_biweight_func *weight_avg)
{
const int mb_xy = sl->mb_xy;
const int mb_type = h->cur_pic.mb_type[mb_xy];