af_join: initialize a variable to shut up gcc warning.
authorAnton Khirnov <anton@khirnov.net>
Mon, 25 Jun 2012 10:57:16 +0000 (12:57 +0200)
committerAnton Khirnov <anton@khirnov.net>
Tue, 26 Jun 2012 17:09:15 +0000 (19:09 +0200)
The warning silenced was:
libavfilter/af_join.c: In function ‘join_request_frame’:
libavfilter/af_join.c:451:9: warning: ‘nb_samples’ may be used uninitialized in this function [-Wuninitialized]

libavfilter/af_join.c

index 89bc47f..e86c556 100644 (file)
@@ -419,7 +419,7 @@ static int join_request_frame(AVFilterLink *outlink)
     JoinBufferPriv *priv;
     int linesize   = INT_MAX;
     int perms      = ~0;
-    int nb_samples;
+    int nb_samples = 0;
     int i, j, ret;
 
     /* get a frame on each input */
@@ -448,6 +448,7 @@ static int join_request_frame(AVFilterLink *outlink)
         perms     &= cur_buf->perms;
     }
 
+    av_assert0(nb_samples > 0);
     buf = avfilter_get_audio_buffer_ref_from_arrays(s->data, linesize, perms,
                                                     nb_samples, outlink->format,
                                                     outlink->channel_layout);