[SCM] libav/experimental: Make sure spatial_decomposition_count is >0.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:43:35 UTC 2013
The following commit has been merged in the experimental branch:
commit 440882f7bec203e9255c9de87468df0fa867d9d1
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Apr 9 19:45:10 2009 +0000
Make sure spatial_decomposition_count is >0.
Originally committed as revision 18394 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index d246b9a..501b60d 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -3582,7 +3582,7 @@ static int decode_header(SnowContext *s){
s->always_reset= get_rac(&s->c, s->header_state);
s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0);
s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0);
- GET_S(s->spatial_decomposition_count, tmp <= (unsigned)MAX_DECOMPOSITIONS)
+ GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS)
s->colorspace_type= get_symbol(&s->c, s->header_state, 0);
s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0);
s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0);
@@ -3615,7 +3615,7 @@ static int decode_header(SnowContext *s){
memcpy(s->plane[2].hcoeff, s->plane[1].hcoeff, sizeof(s->plane[1].hcoeff));
}
if(get_rac(&s->c, s->header_state)){
- GET_S(s->spatial_decomposition_count, tmp <= (unsigned)MAX_DECOMPOSITIONS)
+ GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS)
decode_qlogs(s);
}
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list