From d1845b4c8439effd232fd855a199398a74d35e14 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Sat, 24 May 2008 07:19:12 +0000
Subject: [PATCH] Fix compilation for buggy icc.
Originally committed as revision 13273 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/ffv1.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 23adf287c6d..0dc7c07df52 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;
--
GitLab