1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-21 19:54:13 +02:00

Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-28 07:48:51 +02:00
commit 97f7586cd6

View File

@ -730,7 +730,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA;
}
pred[1] += sign_extend(h[1].values[res], 8);
*samples8++ = av_clip_uint8(pred[1]);
*samples8++ = pred[1];
} else {
if(vlc[0].table)
res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3);
@ -741,7 +741,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA;
}
pred[0] += sign_extend(h[0].values[res], 8);
*samples8++ = av_clip_uint8(pred[0]);
*samples8++ = pred[0];
}
}
}