Mercurial > libavcodec.hg

comparison mpc7.c @ 6242:67986191913d libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Casts to silcence "incompatible pointer type" warnings.
author michael
date Fri, 01 Feb 2008 13:51:06 +0000
parents dfdff1ca78a7
children 8e63d869a904
comparison
equal deleted inserted replaced
6241:2799f65a24de 6242:67986191913d
57 return -1; 57 return -1;
58 } 58 }
59 memset(c->oldDSCF, 0, sizeof(c->oldDSCF)); 59 memset(c->oldDSCF, 0, sizeof(c->oldDSCF));
60 av_init_random(0xDEADBEEF, &c->rnd); 60 av_init_random(0xDEADBEEF, &c->rnd);
61 dsputil_init(&c->dsp, avctx); 61 dsputil_init(&c->dsp, avctx);
62 c->dsp.bswap_buf(buf, avctx->extradata, 4); 62 c->dsp.bswap_buf((uint32_t*)buf, (const uint32_t*)avctx->extradata, 4);
63 ff_mpc_init(); 63 ff_mpc_init();
64 init_get_bits(&gb, buf, 128); 64 init_get_bits(&gb, buf, 128);
65 65
66 c->IS = get_bits1(&gb); 66 c->IS = get_bits1(&gb);
67 c->MSS = get_bits1(&gb); 67 c->MSS = get_bits1(&gb);
173 if(buf_size <= 4){ 173 if(buf_size <= 4){
174 av_log(avctx, AV_LOG_ERROR, "Too small buffer passed (%i bytes)\n", buf_size); 174 av_log(avctx, AV_LOG_ERROR, "Too small buffer passed (%i bytes)\n", buf_size);
175 } 175 }
176 176
177 bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE); 177 bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE);
178 c->dsp.bswap_buf(bits, buf + 4, (buf_size - 4) >> 2); 178 c->dsp.bswap_buf((uint32_t*)bits, (const uint32_t*)(buf + 4), (buf_size - 4) >> 2);
179 init_get_bits(&gb, bits, (buf_size - 4)* 8); 179 init_get_bits(&gb, bits, (buf_size - 4)* 8);
180 skip_bits(&gb, buf[0]); 180 skip_bits(&gb, buf[0]);
181 181
182 /* read subband indexes */ 182 /* read subband indexes */
183 for(i = 0; i <= c->maxbands; i++){ 183 for(i = 0; i <= c->maxbands; i++){