diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
| commit | f7813a5324be39d13ab536c245d15dfc602a7849 (patch) | |
| tree | fad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavcodec/h264pred.c | |
| parent | b7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff) | |
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavcodec/h264pred.c')
| -rw-r--r-- | ffmpeg/libavcodec/h264pred.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ffmpeg/libavcodec/h264pred.c b/ffmpeg/libavcodec/h264pred.c index e5f1f5a..3a96654 100644 --- a/ffmpeg/libavcodec/h264pred.c +++ b/ffmpeg/libavcodec/h264pred.c @@ -25,6 +25,7 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ +#include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "dsputil.h" #include "h264pred.h" @@ -278,12 +279,12 @@ static void pred4x4_horizontal_up_rv40_nodown_c(uint8_t *src, static void pred4x4_tm_vp8_c(uint8_t *src, const uint8_t *topright, ptrdiff_t stride) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; uint8_t *top = src-stride; int y; for (y = 0; y < 4; y++) { - uint8_t *cm_in = cm + src[-1]; + const uint8_t *cm_in = cm + src[-1]; src[0] = cm_in[top[0]]; src[1] = cm_in[top[1]]; src[2] = cm_in[top[2]]; @@ -304,12 +305,12 @@ static void pred16x16_plane_rv40_c(uint8_t *src, ptrdiff_t stride) static void pred16x16_tm_vp8_c(uint8_t *src, ptrdiff_t stride) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; uint8_t *top = src-stride; int y; for (y = 0; y < 16; y++) { - uint8_t *cm_in = cm + src[-1]; + const uint8_t *cm_in = cm + src[-1]; src[0] = cm_in[top[0]]; src[1] = cm_in[top[1]]; src[2] = cm_in[top[2]]; @@ -386,12 +387,12 @@ static void pred8x8_dc_rv40_c(uint8_t *src, ptrdiff_t stride) static void pred8x8_tm_vp8_c(uint8_t *src, ptrdiff_t stride) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; uint8_t *top = src-stride; int y; for (y = 0; y < 8; y++) { - uint8_t *cm_in = cm + src[-1]; + const uint8_t *cm_in = cm + src[-1]; src[0] = cm_in[top[0]]; src[1] = cm_in[top[1]]; src[2] = cm_in[top[2]]; @@ -407,8 +408,9 @@ static void pred8x8_tm_vp8_c(uint8_t *src, ptrdiff_t stride) /** * Set the intra prediction function pointers. */ -void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth, - int chroma_format_idc) +av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, + const int bit_depth, + int chroma_format_idc) { #undef FUNC #undef FUNCC |