diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:21:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:21:44 +0100 |
| commit | bc5383e6c4bbb4fd3e703aba54a7653944d46d9b (patch) | |
| tree | d9ecaa3f1026b2836edc81c6a3142d236d399e28 /libavcodec/h264_mvpred.h | |
| parent | a81a6dcb11cc67811b577fd3dc6175591f358418 (diff) | |
| parent | 3bea6409a1868354a1d29b34de424c3636c222b7 (diff) | |
Merge commit '3bea6409a1868354a1d29b34de424c3636c222b7'
* commit '3bea6409a1868354a1d29b34de424c3636c222b7':
h264_mvpred: constify all uses of H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mvpred.h')
| -rw-r--r-- | libavcodec/h264_mvpred.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 406aed0828..99bea07eec 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -35,7 +35,7 @@ #include "libavutil/avassert.h" -static av_always_inline int fetch_diagonal_mv(H264Context *h, H264SliceContext *sl, +static av_always_inline int fetch_diagonal_mv(const H264Context *h, H264SliceContext *sl, const int16_t **C, int i, int list, int part_width) { @@ -92,7 +92,7 @@ static av_always_inline int fetch_diagonal_mv(H264Context *h, H264SliceContext * * @param mx the x component of the predicted motion vector * @param my the y component of the predicted motion vector */ -static av_always_inline void pred_motion(H264Context *const h, +static av_always_inline void pred_motion(const H264Context *const h, H264SliceContext *sl, int n, int part_width, int list, int ref, @@ -157,7 +157,7 @@ static av_always_inline void pred_motion(H264Context *const h, * @param mx the x component of the predicted motion vector * @param my the y component of the predicted motion vector */ -static av_always_inline void pred_16x8_motion(H264Context *const h, +static av_always_inline void pred_16x8_motion(const H264Context *const h, H264SliceContext *sl, int n, int list, int ref, int *const mx, int *const my) @@ -198,7 +198,7 @@ static av_always_inline void pred_16x8_motion(H264Context *const h, * @param mx the x component of the predicted motion vector * @param my the y component of the predicted motion vector */ -static av_always_inline void pred_8x16_motion(H264Context *const h, +static av_always_inline void pred_8x16_motion(const H264Context *const h, H264SliceContext *sl, int n, int list, int ref, int *const mx, int *const my) @@ -254,7 +254,7 @@ static av_always_inline void pred_8x16_motion(H264Context *const h, } \ } -static av_always_inline void pred_pskip_motion(H264Context *const h, +static av_always_inline void pred_pskip_motion(const H264Context *const h, H264SliceContext *sl) { DECLARE_ALIGNED(4, static const int16_t, zeromv)[2] = { 0 }; @@ -353,7 +353,7 @@ zeromv: return; } -static void fill_decode_neighbors(H264Context *h, H264SliceContext *sl, int mb_type) +static void fill_decode_neighbors(const H264Context *h, H264SliceContext *sl, int mb_type) { const int mb_xy = sl->mb_xy; int topleft_xy, top_xy, topright_xy, left_xy[LEFT_MBS]; @@ -442,7 +442,7 @@ static void fill_decode_neighbors(H264Context *h, H264SliceContext *sl, int mb_t sl->topright_type = 0; } -static void fill_decode_caches(H264Context *h, H264SliceContext *sl, int mb_type) +static void fill_decode_caches(const H264Context *h, H264SliceContext *sl, int mb_type) { int topleft_xy, top_xy, topright_xy, left_xy[LEFT_MBS]; int topleft_type, top_type, topright_type, left_type[LEFT_MBS]; @@ -800,7 +800,7 @@ static void fill_decode_caches(H264Context *h, H264SliceContext *sl, int mb_type /** * decodes a P_SKIP or B_SKIP macroblock */ -static void av_unused decode_mb_skip(H264Context *h, H264SliceContext *sl) +static void av_unused decode_mb_skip(const H264Context *h, H264SliceContext *sl) { const int mb_xy = sl->mb_xy; int mb_type = 0; |