diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:22:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:22:15 +0100 |
| commit | 06e5b331f5bc32c7a09db4de90841225dfcd8930 (patch) | |
| tree | a3b668ce0f84efb0a01b2404dc00d973551e2f68 /libavcodec/h264_mb.c | |
| parent | bc5383e6c4bbb4fd3e703aba54a7653944d46d9b (diff) | |
| parent | 51822879e7732ee8175dad98dde1a135f6e5c1a4 (diff) | |
| download | ffmpeg-06e5b331f5bc32c7a09db4de90841225dfcd8930.tar.gz | |
Merge commit '51822879e7732ee8175dad98dde1a135f6e5c1a4'
* commit '51822879e7732ee8175dad98dde1a135f6e5c1a4':
h264_mb: constify block_offset
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 4 |
1 files changed, 2 insertions, 2 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) { |