diff options
author | irungentoo <irungentoo@gmail.com> | 2014-08-04 13:49:53 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-08-04 13:49:53 -0400 |
commit | aaaeac8f3d66d2888430b4c30b58f26e9f0e1011 (patch) | |
tree | ccfcbf117742f274ce9552e875533fccee357621 /toxav/toxav.c | |
parent | d4218dcd6124751c5978183531db144398485a94 (diff) | |
parent | d08d03236806cbc062968910983b92dc59763404 (diff) |
Merge branch 'master' of https://github.com/mannol1/toxcore
Conflicts:
toxav/toxav.c
Diffstat (limited to 'toxav/toxav.c')
-rw-r--r-- | toxav/toxav.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxav/toxav.c b/toxav/toxav.c index 11eafcb5..8179103c 100644 --- a/toxav/toxav.c +++ b/toxav/toxav.c | |||
@@ -193,7 +193,7 @@ ToxAv *toxav_new( Tox *messenger, int32_t max_calls) | |||
193 | */ | 193 | */ |
194 | void toxav_kill ( ToxAv *av ) | 194 | void toxav_kill ( ToxAv *av ) |
195 | { | 195 | { |
196 | int i; | 196 | uint32_t i; |
197 | 197 | ||
198 | for (i = 0; i < av->max_calls; i ++) { | 198 | for (i = 0; i < av->max_calls; i ++) { |
199 | if ( av->calls[i].crtps[audio_index] ) | 199 | if ( av->calls[i].crtps[audio_index] ) |