diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-03 01:24:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-03 01:25:04 +0200 |
| commit | 0b23452c01c5f8145de111f09c0e9a7d5bd82068 (patch) | |
| tree | b16e2b26db766fceb8a6b07813065336337a9078 /libavcodec | |
| parent | f099fbf5f3ac1d6b3753fc8dfda6558572111fbd (diff) | |
| download | ffmpeg-0b23452c01c5f8145de111f09c0e9a7d5bd82068.tar.gz | |
ffv1: fix 2 uninitialized variable warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ffv1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 6650a235a2..4f9068084a 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -597,7 +597,7 @@ static void encode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int sample[p][i]= s->sample_buffer + p*ring_size*(w+6) + ((h+i-y)%ring_size)*(w+6) + 3; for(x=0; x<w; x++){ - int b,g,r,a; + int b,g,r,av_uninit(a); if(lbd){ unsigned v= *((uint32_t*)(src[0] + x*4 + stride[0]*y)); b= v&0xFF; @@ -1831,7 +1831,7 @@ static int read_extra_header(FFV1Context *f){ static int read_header(FFV1Context *f){ uint8_t state[CONTEXT_SIZE]; - int i, j, context_count; + int i, j, context_count = -1; //-1 to avoid warning RangeCoder * const c= &f->slice_context[0]->c; memset(state, 128, sizeof(state)); @@ -2002,6 +2002,7 @@ static int read_header(FFV1Context *f){ } if(f->version <= 2){ + av_assert0(context_count>=0); if(p->context_count < context_count){ av_freep(&p->state); av_freep(&p->vlc_state); |