diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 16:36:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 16:36:47 +0100 |
| commit | 5c076205a67d44c9e28ce5a74b55d281d1a3c106 (patch) | |
| tree | 56824e88a7c7a208864a04ec3a4659d5e7fd1bcb /libavcodec/golomb.h | |
| parent | 1a4250493b3aae4ca366092fb0922e7c098f478c (diff) | |
| parent | 9a2e79116d6235c53d8e9663a8d30d1950d7431a (diff) | |
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/golomb.h')
| -rw-r--r-- | libavcodec/golomb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 0ce1b34959..0629c783de 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -107,7 +107,8 @@ static inline int get_ue_golomb_31(GetBitContext *gb){ return ff_ue_golomb_vlc_code[buf]; } -static inline int svq3_get_ue_golomb(GetBitContext *gb){ +static inline unsigned svq3_get_ue_golomb(GetBitContext *gb) +{ uint32_t buf; OPEN_READER(re, gb); @@ -121,7 +122,7 @@ static inline int svq3_get_ue_golomb(GetBitContext *gb){ return ff_interleaved_ue_golomb_vlc_code[buf]; }else{ - int ret = 1; + unsigned ret = 1; do { buf >>= 32 - 8; |