aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-25 04:15:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-25 04:15:56 +0100
commit964506bb979e8c972833c7421a39f3275d3cd3c0 (patch)
tree87ca182eda754508cbe51d09634d74b14091f97c
parent5257743aee0c3982f0079e6553aabc6aa39401d2 (diff)
downloadffmpeg-964506bb979e8c972833c7421a39f3275d3cd3c0.tar.gz
golomb: Fix infinite loop in svq3_get_ue_golomb()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/golomb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 14cf05504f..638357b470 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -123,7 +123,7 @@ static inline int svq3_get_ue_golomb(GetBitContext *gb){
}else{
int ret = 1;
- while (1) {
+ do {
buf >>= 32 - 8;
LAST_SKIP_BITS(re, gb, FFMIN(ff_interleaved_golomb_vlc_len[buf], 8));
@@ -135,7 +135,7 @@ static inline int svq3_get_ue_golomb(GetBitContext *gb){
ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf];
UPDATE_CACHE(re, gb);
buf = GET_CACHE(re, gb);
- }
+ } while(ret<0x8000000U);
CLOSE_READER(re, gb);
return ret - 1;