mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-11-01 04:53:04 +08:00 
			
		
		
		
	Casts to silcence "incompatible pointer type" warnings.
Originally committed as revision 11733 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		| @@ -59,7 +59,7 @@ static int mpc7_decode_init(AVCodecContext * avctx) | |||||||
|     memset(c->oldDSCF, 0, sizeof(c->oldDSCF)); |     memset(c->oldDSCF, 0, sizeof(c->oldDSCF)); | ||||||
|     av_init_random(0xDEADBEEF, &c->rnd); |     av_init_random(0xDEADBEEF, &c->rnd); | ||||||
|     dsputil_init(&c->dsp, avctx); |     dsputil_init(&c->dsp, avctx); | ||||||
|     c->dsp.bswap_buf(buf, avctx->extradata, 4); |     c->dsp.bswap_buf((uint32_t*)buf, (const uint32_t*)avctx->extradata, 4); | ||||||
|     ff_mpc_init(); |     ff_mpc_init(); | ||||||
|     init_get_bits(&gb, buf, 128); |     init_get_bits(&gb, buf, 128); | ||||||
|  |  | ||||||
| @@ -175,7 +175,7 @@ static int mpc7_decode_frame(AVCodecContext * avctx, | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE); |     bits = av_malloc(((buf_size - 1) & ~3) + FF_INPUT_BUFFER_PADDING_SIZE); | ||||||
|     c->dsp.bswap_buf(bits, buf + 4, (buf_size - 4) >> 2); |     c->dsp.bswap_buf((uint32_t*)bits, (const uint32_t*)(buf + 4), (buf_size - 4) >> 2); | ||||||
|     init_get_bits(&gb, bits, (buf_size - 4)* 8); |     init_get_bits(&gb, bits, (buf_size - 4)* 8); | ||||||
|     skip_bits(&gb, buf[0]); |     skip_bits(&gb, buf[0]); | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Michael Niedermayer
					Michael Niedermayer