More consistent with uspp and allows for future 10bit support Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.6
| @@ -156,7 +156,7 @@ static void softthresh_c(int16_t dst[64], const int16_t src[64], | |||||
| } | } | ||||
| } | } | ||||
| static void store_slice_c(uint8_t *dst, const int16_t *src, | |||||
| static void store_slice_c(uint8_t *dst, const uint16_t *src, | |||||
| int dst_linesize, int src_linesize, | int dst_linesize, int src_linesize, | ||||
| int width, int height, int log2_scale, | int width, int height, int log2_scale, | ||||
| const uint8_t dither[8][8]) | const uint8_t dither[8][8]) | ||||
| @@ -186,7 +186,7 @@ static void store_slice_c(uint8_t *dst, const int16_t *src, | |||||
| } | } | ||||
| } | } | ||||
| static inline void add_block(int16_t *dst, int linesize, const int16_t block[64]) | |||||
| static inline void add_block(uint16_t *dst, int linesize, const int16_t block[64]) | |||||
| { | { | ||||
| int y; | int y; | ||||
| @@ -37,7 +37,7 @@ typedef struct { | |||||
| int qscale_type; | int qscale_type; | ||||
| int temp_linesize; | int temp_linesize; | ||||
| uint8_t *src; | uint8_t *src; | ||||
| int16_t *temp; | |||||
| uint16_t *temp; | |||||
| AVCodecContext *avctx; | AVCodecContext *avctx; | ||||
| AVDCT *dct; | AVDCT *dct; | ||||
| int8_t *non_b_qp_table; | int8_t *non_b_qp_table; | ||||
| @@ -45,7 +45,7 @@ typedef struct { | |||||
| int use_bframe_qp; | int use_bframe_qp; | ||||
| int hsub, vsub; | int hsub, vsub; | ||||
| void (*store_slice)(uint8_t *dst, const int16_t *src, | |||||
| void (*store_slice)(uint8_t *dst, const uint16_t *src, | |||||
| int dst_stride, int src_stride, | int dst_stride, int src_stride, | ||||
| int width, int height, int log2_scale, | int width, int height, int log2_scale, | ||||
| const uint8_t dither[8][8]); | const uint8_t dither[8][8]); | ||||
| @@ -174,7 +174,7 @@ static void softthresh_mmx(int16_t dst[64], const int16_t src[64], | |||||
| dst[0] = (src[0] + 4) >> 3; | dst[0] = (src[0] + 4) >> 3; | ||||
| } | } | ||||
| static void store_slice_mmx(uint8_t *dst, const int16_t *src, | |||||
| static void store_slice_mmx(uint8_t *dst, const uint16_t *src, | |||||
| int dst_stride, int src_stride, | int dst_stride, int src_stride, | ||||
| int width, int height, int log2_scale, | int width, int height, int log2_scale, | ||||
| const uint8_t dither[8][8]) | const uint8_t dither[8][8]) | ||||