diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:18:37 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:18:40 +0300 |
commit | 9f2fad1af768ed374164beed60cddcf0bae8732f (patch) | |
tree | 3d6c741b49df5c330fb80b99ccc2f7b2cb24f903 /libavcodec/h264.h | |
parent | 9d0450ae943a7d1071fa59bfd0c4f7647d733c5f (diff) | |
parent | 5c4b98de4d101ea715ef86847306a510afd0db0c (diff) |
Merge commit '5c4b98de4d101ea715ef86847306a510afd0db0c'
* commit '5c4b98de4d101ea715ef86847306a510afd0db0c':
h264.c: constify all uses of H264Context in slice and lower-level functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 45545b6cdb..f028efd074 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -857,13 +857,13 @@ int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice); * Check if the top & left blocks are available if needed & 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); /** * Check if the top & left blocks are available if needed & 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); void ff_h264_hl_decode_mb(const H264Context *h, H264SliceContext *sl); @@ -1161,7 +1161,7 @@ void ff_h264_unref_picture(H264Context *h, H264Picture *pic); int ff_h264_context_init(H264Context *h); int ff_h264_set_parameter_from_sps(H264Context *h); -void ff_h264_draw_horiz_band(H264Context *h, H264SliceContext *sl, int y, int height); +void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, int y, int height); int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); int ff_pred_weight_table(H264Context *h, H264SliceContext *sl); int ff_set_ref_count(H264Context *h, H264SliceContext *sl); |