summaryrefslogtreecommitdiff
path: root/libavfilter/af_join.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-06-25 12:57:16 +0200
committerAnton Khirnov <anton@khirnov.net>2012-06-26 19:09:15 +0200
commitfd2784c3b5e5ea13dd308b1eeeef0dd3c22a3d4a (patch)
treea5c4a0a163158a4c6cf26563d82ae80ce149dda9 /libavfilter/af_join.c
parent422008ac6320561d38e3024dbb40690be14b2e7b (diff)
af_join: initialize a variable to shut up gcc warning.
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]
Diffstat (limited to 'libavfilter/af_join.c')
-rw-r--r--libavfilter/af_join.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 89bc47fde1..e86c556f5b 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -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);