summaryrefslogtreecommitdiff
path: root/libavcodec/msmpeg4.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-09-27 22:13:44 +0000
committerMåns Rullgård <mans@mansr.com>2006-09-27 22:13:44 +0000
commitb86216de4c2e491bdd418af7b379c638d9edd234 (patch)
tree72d211c5641d9b01c94d06b95b919828a3f7b04a /libavcodec/msmpeg4.c
parentbca99b47bf808fcca728404c50a291da9f98b270 (diff)
dc_val should be signed
Originally committed as revision 6364 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/msmpeg4.c')
-rw-r--r--libavcodec/msmpeg4.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 23c41ef405..271a28336f 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -627,10 +627,10 @@ static int get_dc(uint8_t *src, int stride, int scale)
/* dir = 0: left, dir = 1: top prediction */
static inline int msmpeg4_pred_dc(MpegEncContext * s, int n,
- uint16_t **dc_val_ptr, int *dir_ptr)
+ int16_t **dc_val_ptr, int *dir_ptr)
{
int a, b, c, wrap, pred, scale;
- uint16_t *dc_val;
+ int16_t *dc_val;
/* find prediction */
if (n < 4) {
@@ -787,7 +787,7 @@ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr
/* update predictor */
*dc_val= level;
}else{
- uint16_t *dc_val;
+ int16_t *dc_val;
pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr);
/* update predictor */
@@ -1875,7 +1875,7 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
/* update predictor */
*dc_val= level;
}else{
- uint16_t *dc_val;
+ int16_t *dc_val;
pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr);
level += pred;