[SCM] libav/experimental: 10l (segfault)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit fa2522d7009fefaacf85855e8f3f4aec9f4ef007
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Aug 3 01:07:19 2004 +0000

    10l (segfault)
    
    Originally committed as revision 3375 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index a85baea..abd76ba 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -430,7 +430,7 @@ static inline void encode_line(FFV1Context *s, int w, int_fast16_t *sample[2], i
 
 static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
     int x,y,i;
-    const int ring_size=2;
+    const int ring_size= s->avctx->context_model ? 3 : 2;
     int_fast16_t sample_buffer[ring_size][w+6], *sample[ring_size];
     s->run_index=0;
     
@@ -453,7 +453,7 @@ static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride,
 
 static void encode_rgb_frame(FFV1Context *s, uint32_t *src, int w, int h, int stride){
     int x, y, p, i;
-    const int ring_size=2;
+    const int ring_size= s->avctx->context_model ? 3 : 2;
     int_fast16_t sample_buffer[3][ring_size][w+6], *sample[3][ring_size];
     s->run_index=0;
     

-- 
Libav/FFmpeg packaging