Mercurial > libavcodec.hg
comparison snow.c @ 9371:6de6fb68621c libavcodec
Make sure spatial_decomposition_count is >0.
author | michael |
---|---|
date | Thu, 09 Apr 2009 19:45:10 +0000 |
parents | 25fa07ef8e2b |
children | 9bb96825fc10 |
comparison
equal
deleted
inserted
replaced
9370:25fa07ef8e2b | 9371:6de6fb68621c |
---|---|
3580 if(s->keyframe){ | 3580 if(s->keyframe){ |
3581 GET_S(s->version, tmp <= 0U) | 3581 GET_S(s->version, tmp <= 0U) |
3582 s->always_reset= get_rac(&s->c, s->header_state); | 3582 s->always_reset= get_rac(&s->c, s->header_state); |
3583 s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0); | 3583 s->temporal_decomposition_type= get_symbol(&s->c, s->header_state, 0); |
3584 s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0); | 3584 s->temporal_decomposition_count= get_symbol(&s->c, s->header_state, 0); |
3585 GET_S(s->spatial_decomposition_count, tmp <= (unsigned)MAX_DECOMPOSITIONS) | 3585 GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS) |
3586 s->colorspace_type= get_symbol(&s->c, s->header_state, 0); | 3586 s->colorspace_type= get_symbol(&s->c, s->header_state, 0); |
3587 s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0); | 3587 s->chroma_h_shift= get_symbol(&s->c, s->header_state, 0); |
3588 s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0); | 3588 s->chroma_v_shift= get_symbol(&s->c, s->header_state, 0); |
3589 s->spatial_scalability= get_rac(&s->c, s->header_state); | 3589 s->spatial_scalability= get_rac(&s->c, s->header_state); |
3590 // s->rate_scalability= get_rac(&s->c, s->header_state); | 3590 // s->rate_scalability= get_rac(&s->c, s->header_state); |
3613 s->plane[2].diag_mc= s->plane[1].diag_mc; | 3613 s->plane[2].diag_mc= s->plane[1].diag_mc; |
3614 s->plane[2].htaps = s->plane[1].htaps; | 3614 s->plane[2].htaps = s->plane[1].htaps; |
3615 memcpy(s->plane[2].hcoeff, s->plane[1].hcoeff, sizeof(s->plane[1].hcoeff)); | 3615 memcpy(s->plane[2].hcoeff, s->plane[1].hcoeff, sizeof(s->plane[1].hcoeff)); |
3616 } | 3616 } |
3617 if(get_rac(&s->c, s->header_state)){ | 3617 if(get_rac(&s->c, s->header_state)){ |
3618 GET_S(s->spatial_decomposition_count, tmp <= (unsigned)MAX_DECOMPOSITIONS) | 3618 GET_S(s->spatial_decomposition_count, 0 < tmp && tmp <= MAX_DECOMPOSITIONS) |
3619 decode_qlogs(s); | 3619 decode_qlogs(s); |
3620 } | 3620 } |
3621 } | 3621 } |
3622 | 3622 |
3623 s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1); | 3623 s->spatial_decomposition_type+= get_symbol(&s->c, s->header_state, 1); |