]> git.sesse.net Git - vlc/commitdiff
Fixed potential use of uninitialized value (format.c).
authorLaurent Aimar <fenrir@videolan.org>
Sat, 6 Feb 2010 13:35:25 +0000 (14:35 +0100)
committerLaurent Aimar <fenrir@videolan.org>
Sat, 6 Feb 2010 13:40:45 +0000 (14:40 +0100)
modules/audio_filter/converter/format.c

index 87040a29e77ba5cccca232eeeea1ed2fecd25194..22fae9105ad59a22653b66f9b4e8a85151749425 100644 (file)
@@ -170,14 +170,12 @@ static block_t *Filter(filter_t *filter, block_t *block)
         sys->pre(block);
 
     for (int i = 0; i < 2; i++) {
-        block_t *out;
         if (sys->directs[i]) {
-            out = sys->directs[i](filter, block);
-            assert(out == block);
+            block = sys->directs[i](filter, block);
         } else if (sys->indirects[i]) {
             int dst_size = sys->indirects_ratio[i][1] *
                            (block->i_buffer / sys->indirects_ratio[i][0]);
-            out = filter_NewAudioBuffer(filter, dst_size);
+            block_t *out = filter_NewAudioBuffer(filter, dst_size);
             if (!out) {
                 block_Release(block);
                 return NULL;
@@ -191,8 +189,8 @@ static block_t *Filter(filter_t *filter, block_t *block)
             sys->indirects[i](out, block);
 
             block_Release(block);
+            block = out;
         }
-        block = out;
     }
 
     if (sys->post)