summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-21 17:22:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 17:22:15 +0100
commit06e5b331f5bc32c7a09db4de90841225dfcd8930 (patch)
treea3b668ce0f84efb0a01b2404dc00d973551e2f68 /libavcodec
parentbc5383e6c4bbb4fd3e703aba54a7653944d46d9b (diff)
parent51822879e7732ee8175dad98dde1a135f6e5c1a4 (diff)
downloadffmpeg-06e5b331f5bc32c7a09db4de90841225dfcd8930.tar.gz
Merge commit '51822879e7732ee8175dad98dde1a135f6e5c1a4'
* commit '51822879e7732ee8175dad98dde1a135f6e5c1a4': h264_mb: constify block_offset Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264_mb.c4
-rw-r--r--libavcodec/h264_mb_template.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c
index a1f0619f11..2240b54a12 100644
--- a/libavcodec/h264_mb.c
+++ b/libavcodec/h264_mb.c
@@ -616,7 +616,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
int simple,
int transform_bypass,
int pixel_shift,
- int *block_offset,
+ const int *block_offset,
int linesize,
uint8_t *dest_y, int p)
{
@@ -737,7 +737,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, H264SliceCon
int is_h264, int simple,
int transform_bypass,
int pixel_shift,
- int *block_offset,
+ const int *block_offset,
int linesize,
uint8_t *dest_y, int p)
{
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c
index a46377aeb6..67c332ed17 100644
--- a/libavcodec/h264_mb_template.c
+++ b/libavcodec/h264_mb_template.c
@@ -49,7 +49,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl)
uint8_t *dest_y, *dest_cb, *dest_cr;
int linesize, uvlinesize /*dct_offset*/;
int i, j;
- int *block_offset = &h->block_offset[0];
+ const int *block_offset = &h->block_offset[0];
const int transform_bypass = !SIMPLE && (sl->qscale == 0 && h->sps.transform_bypass);
/* is_h264 should always be true if SVQ3 is disabled. */
const int is_h264 = !CONFIG_SVQ3_DECODER || SIMPLE || h->avctx->codec_id == AV_CODEC_ID_H264;
@@ -278,7 +278,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext
uint8_t *dest[3];
int linesize;
int i, j, p;
- int *block_offset = &h->block_offset[0];
+ const int *block_offset = &h->block_offset[0];
const int transform_bypass = !SIMPLE && (sl->qscale == 0 && h->sps.transform_bypass);
const int plane_count = (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) ? 3 : 1;