diff options
author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-24 07:19:12 +0000 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-24 07:19:12 +0000 |
commit | d1845b4c8439effd232fd855a199398a74d35e14 (patch) | |
tree | 22406866a093185e140bac784866feacc322436a /libavcodec | |
parent | f61d45c99e410876ad6cb0a87d2af0ebeea18be3 (diff) | |
download | ffmpeg-d1845b4c8439effd232fd855a199398a74d35e14.tar.gz |
Fix compilation for buggy icc.
Originally committed as revision 13273 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/ffv1.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 23adf287c6..0dc7c07df5 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -768,7 +768,9 @@ static inline void decode_line(FFV1Context *s, int w, int_fast16_t *sample[2], i static void decode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){ int x, y; int_fast16_t sample_buffer[2][w+6]; - int_fast16_t *sample[2]= {sample_buffer[0]+3, sample_buffer[1]+3}; + int_fast16_t *sample[2]; + sample[0]=sample_buffer[0]+3; + sample[1]=sample_buffer[1]+3; s->run_index=0; @@ -795,10 +797,11 @@ static void decode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, static void decode_rgb_frame(FFV1Context *s, uint32_t *src, int w, int h, int stride){ int x, y, p; int_fast16_t sample_buffer[3][2][w+6]; - int_fast16_t *sample[3][2]= { - {sample_buffer[0][0]+3, sample_buffer[0][1]+3}, - {sample_buffer[1][0]+3, sample_buffer[1][1]+3}, - {sample_buffer[2][0]+3, sample_buffer[2][1]+3}}; + int_fast16_t *sample[3][2]; + for(x=0; x<3; x++){ + sample[x][0] = sample_buffer[x][0]+3; + sample[x][1] = sample_buffer[x][1]+3; + } s->run_index=0; |