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 /auto_tests/toxav_many_test.c | |
| parent | 2ca2baf120c5dd4dcdd9c450ef35560b0726136f (diff) | |
| parent | b63e4ad88fb93820fb740372f36d74c65b8b7b81 (diff) | |
Fixed conflicts
Diffstat (limited to 'auto_tests/toxav_many_test.c')
| -rw-r--r-- | auto_tests/toxav_many_test.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c index b64caf10..ee4c812c 100644 --- a/auto_tests/toxav_many_test.c +++ b/auto_tests/toxav_many_test.c | |||
| @@ -127,7 +127,6 @@ static void callback_audio(ToxAv *av, int32_t call_index, int16_t *data, int len | |||
| 127 | static void callback_video(ToxAv *av, int32_t call_index, vpx_image_t *img) | 127 | static void callback_video(ToxAv *av, int32_t call_index, vpx_image_t *img) |
| 128 | { | 128 | { |
| 129 | } | 129 | } |
| 130 | |||
| 131 | void register_callbacks(ToxAv* av, void* data) | 130 | void register_callbacks(ToxAv* av, void* data) |
| 132 | { | 131 | { |
| 133 | toxav_register_callstate_callback(av, callback_call_started, av_OnStart, data); | 132 | toxav_register_callstate_callback(av, callback_call_started, av_OnStart, data); |