diff options
| author | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
|---|---|---|
| committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
| commit | 79115259a81dc958041f18573f34299c083cebea (patch) | |
| tree | 594fbf60dc01e2aa78c775c4e2d9977c5b18752f /toxav/codec.c | |
| parent | 2ca2baf120c5dd4dcdd9c450ef35560b0726136f (diff) | |
| parent | b63e4ad88fb93820fb740372f36d74c65b8b7b81 (diff) | |
Fixed conflicts
Diffstat (limited to 'toxav/codec.c')
| -rw-r--r-- | toxav/codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxav/codec.c b/toxav/codec.c index ae24a976..b7ca2784 100644 --- a/toxav/codec.c +++ b/toxav/codec.c | |||
| @@ -383,7 +383,7 @@ void codec_terminate_session ( CodecState *cs ) | |||
| 383 | free(cs); | 383 | free(cs); |
| 384 | } | 384 | } |
| 385 | 385 | ||
| 386 | inline float calculate_sum_sq (int16_t *n, uint16_t k) | 386 | static float calculate_sum_sq (int16_t *n, uint16_t k) |
| 387 | { | 387 | { |
| 388 | float result = 0; | 388 | float result = 0; |
| 389 | uint16_t i = 0; | 389 | uint16_t i = 0; |