diff options
author | Anton Khirnov <anton@khirnov.net> | 2015-01-27 15:53:33 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:15 +0100 |
commit | 5c4b98de4d101ea715ef86847306a510afd0db0c (patch) | |
tree | 9a0cdf557c3024054391c7e316e8f38bc0b09e1d /libavcodec/h264.c | |
parent | e9b2383bf86b38ad18a001801aee20c8182e29bd (diff) | |
download | ffmpeg-5c4b98de4d101ea715ef86847306a510afd0db0c.tar.gz |
h264.c: constify all uses of H264Context in slice and lower-level functions
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.c')
-rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 59c822c383..e441a81a77 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -78,11 +78,11 @@ static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, ff_h264_hl_decode_mb(h, &h->slice_ctx[0]); } -void ff_h264_draw_horiz_band(H264Context *h, H264SliceContext *sl, +void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, int y, int height) { AVCodecContext *avctx = h->avctx; - AVFrame *cur = &h->cur_pic.f; + const AVFrame *cur = &h->cur_pic.f; AVFrame *last = sl->ref_list[0][0].f.data[0] ? &sl->ref_list[0][0].f : NULL; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); int vshift = desc->log2_chroma_h; @@ -98,7 +98,7 @@ void ff_h264_draw_horiz_band(H264Context *h, H264SliceContext *sl, return; if (avctx->draw_horiz_band) { - AVFrame *src; + const AVFrame *src; int offset[AV_NUM_DATA_POINTERS]; int i; @@ -127,7 +127,7 @@ void ff_h264_draw_horiz_band(H264Context *h, H264SliceContext *sl, * Check if the top & left blocks are available if needed and * change the dc mode so it only uses the available blocks. */ -int ff_h264_check_intra4x4_pred_mode(H264Context *h, H264SliceContext *sl) +int ff_h264_check_intra4x4_pred_mode(const H264Context *h, H264SliceContext *sl) { static const int8_t top[12] = { -1, 0, LEFT_DC_PRED, -1, -1, -1, -1, -1, 0 @@ -174,7 +174,7 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h, H264SliceContext *sl) * Check if the top & left blocks are available if needed and * change the dc mode so it only uses the available blocks. */ -int ff_h264_check_intra_pred_mode(H264Context *h, H264SliceContext *sl, +int ff_h264_check_intra_pred_mode(const H264Context *h, H264SliceContext *sl, int mode, int is_chroma) { static const int8_t top[4] = { LEFT_DC_PRED8x8, 1, -1, -1 }; |