comparison ffv1.c @ 6847:c2a365612e80 libavcodec

Fix compilation for buggy icc.
author cehoyos
date Sat, 24 May 2008 07:19:12 +0000
parents e1302edb0f69
children e943e1409077
comparison
equal deleted inserted replaced
6846:4346441afca6 6847:c2a365612e80
766 } 766 }
767 767
768 static void decode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){ 768 static void decode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
769 int x, y; 769 int x, y;
770 int_fast16_t sample_buffer[2][w+6]; 770 int_fast16_t sample_buffer[2][w+6];
771 int_fast16_t *sample[2]= {sample_buffer[0]+3, sample_buffer[1]+3}; 771 int_fast16_t *sample[2];
772 sample[0]=sample_buffer[0]+3;
773 sample[1]=sample_buffer[1]+3;
772 774
773 s->run_index=0; 775 s->run_index=0;
774 776
775 memset(sample_buffer, 0, sizeof(sample_buffer)); 777 memset(sample_buffer, 0, sizeof(sample_buffer));
776 778
793 } 795 }
794 796
795 static void decode_rgb_frame(FFV1Context *s, uint32_t *src, int w, int h, int stride){ 797 static void decode_rgb_frame(FFV1Context *s, uint32_t *src, int w, int h, int stride){
796 int x, y, p; 798 int x, y, p;
797 int_fast16_t sample_buffer[3][2][w+6]; 799 int_fast16_t sample_buffer[3][2][w+6];
798 int_fast16_t *sample[3][2]= { 800 int_fast16_t *sample[3][2];
799 {sample_buffer[0][0]+3, sample_buffer[0][1]+3}, 801 for(x=0; x<3; x++){
800 {sample_buffer[1][0]+3, sample_buffer[1][1]+3}, 802 sample[x][0] = sample_buffer[x][0]+3;
801 {sample_buffer[2][0]+3, sample_buffer[2][1]+3}}; 803 sample[x][1] = sample_buffer[x][1]+3;
804 }
802 805
803 s->run_index=0; 806 s->run_index=0;
804 807
805 memset(sample_buffer, 0, sizeof(sample_buffer)); 808 memset(sample_buffer, 0, sizeof(sample_buffer));
806 809