aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv30.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-08 16:36:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-08 16:36:47 +0100
commit5c076205a67d44c9e28ce5a74b55d281d1a3c106 (patch)
tree56824e88a7c7a208864a04ec3a4659d5e7fd1bcb /libavcodec/rv30.c
parent1a4250493b3aae4ca366092fb0922e7c098f478c (diff)
parent9a2e79116d6235c53d8e9663a8d30d1950d7431a (diff)
downloadffmpeg-5c076205a67d44c9e28ce5a74b55d281d1a3c106.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: golomb: use unsigned arithmetics in svq3_get_ue_golomb() x86: float_dsp: fix loading of the len parameter on x86-32 takdec: fix initialisation of LOCAL_ALIGNED array takdec: fix initialisation of LOCAL_ALIGNED array Conflicts: libavcodec/rv30.c libavcodec/svq3.c libavcodec/takdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv30.c')
-rw-r--r--libavcodec/rv30.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index df2160ab94..9d33051354 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -78,8 +78,8 @@ static int rv30_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t
for(i = 0; i < 4; i++, dst += r->intra_types_stride - 4){
for(j = 0; j < 4; j+= 2){
- int code = svq3_get_ue_golomb(gb) << 1;
- if(code > 80U*2U){
+ unsigned code = svq3_get_ue_golomb(gb) << 1;
+ if (code > 80U*2U) {
av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n");
return -1;
}
@@ -106,9 +106,9 @@ static int rv30_decode_mb_info(RV34DecContext *r)
static const int rv30_b_types[6] = { RV34_MB_SKIP, RV34_MB_B_DIRECT, RV34_MB_B_FORWARD, RV34_MB_B_BACKWARD, RV34_MB_TYPE_INTRA, RV34_MB_TYPE_INTRA16x16 };
MpegEncContext *s = &r->s;
GetBitContext *gb = &s->gb;
- int code = svq3_get_ue_golomb(gb);
+ unsigned code = svq3_get_ue_golomb(gb);
- if(code > 11U){
+ if (code > 11) {
av_log(s->avctx, AV_LOG_ERROR, "Incorrect MB type code\n");
return -1;
}