comparison mpegaudiodec.c @ 7870:08ef30f08a01 libavcodec

Only print "invalid new backstep" when it is really invalid. Fixes issue541.
author michael
date Tue, 16 Sep 2008 01:49:32 +0000
parents 2a611af7bcbe
children e70975d5ff80
comparison
equal deleted inserted replaced
7869:cd18f66b3663 7870:08ef30f08a01
2238 align_get_bits(&s->gb); 2238 align_get_bits(&s->gb);
2239 assert((get_bits_count(&s->gb) & 7) == 0); 2239 assert((get_bits_count(&s->gb) & 7) == 0);
2240 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3; 2240 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3;
2241 2241
2242 if(i<0 || i > BACKSTEP_SIZE || nb_frames<0){ 2242 if(i<0 || i > BACKSTEP_SIZE || nb_frames<0){
2243 av_log(s->avctx, AV_LOG_WARNING, "invalid new backstep %d\n", i); 2243 if(i<0)
2244 av_log(s->avctx, AV_LOG_ERROR, "invalid new backstep %d\n", i);
2244 i= FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE); 2245 i= FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE);
2245 } 2246 }
2246 assert(i <= buf_size - HEADER_SIZE && i>= 0); 2247 assert(i <= buf_size - HEADER_SIZE && i>= 0);
2247 memcpy(s->last_buf + s->last_buf_size, s->gb.buffer + buf_size - HEADER_SIZE - i, i); 2248 memcpy(s->last_buf + s->last_buf_size, s->gb.buffer + buf_size - HEADER_SIZE - i, i);
2248 s->last_buf_size += i; 2249 s->last_buf_size += i;