2 files changed, 16 insertions, 14 deletions

diff --git a/toxav/toxav.c b/toxav/toxav.c
index 38114ad1..a301e007 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -77,8 +77,8 @@ struct _ToxAv {
     MSISession *msi_session; /** Main msi session */
     CallSpecific *calls; /** Per-call params */
 
-    void (*audio_callback)(ToxAv*, int32_t, int16_t*, int);
-    void (*video_callback)(ToxAv*, int32_t, vpx_image_t*);
+    void (*audio_callback)(ToxAv *, int32_t, int16_t *, int);
+    void (*video_callback)(ToxAv *, int32_t, vpx_image_t *);
 
     uint32_t max_calls;
 };
@@ -178,7 +178,7 @@ void toxav_register_callstate_callback ( ToxAVCallback callback, ToxAvCallbackID
  * @param callback The callback
  * @return void
  */
-void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int32_t, int16_t*, int))
+void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, int16_t *, int))
 {
     av->audio_callback = callback;
 }
@@ -189,9 +189,9 @@ void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int
  * @param callback The callback
  * @return void
  */
-void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int32_t, vpx_image_t*))
+void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, vpx_image_t *))
 {
-   av->video_callback = callback;
+    av->video_callback = callback;
 }
 
 /**
@@ -758,22 +758,22 @@ void toxav_handle_packet(RTPSession *_session, RTPMessage *_msg)
     int32_t call_index = _session->call_index;
     CallSpecific *call = &av->calls[call_index];
 
-    if(_session->payload_type == type_audio % 128) {
+    if (_session->payload_type == type_audio % 128) {
         queue(call->j_buf, _msg);
 
         int success = 0, dec_size;
         int frame_size = 960;
         int16_t dest[frame_size];
 
-        while((_msg = dequeue(call->j_buf, &success)) || success == 2) {
-            if(success == 2) {
+        while ((_msg = dequeue(call->j_buf, &success)) || success == 2) {
+            if (success == 2) {
                 dec_size = opus_decode(call->cs->audio_decoder, NULL, 0, dest, frame_size, 1);
             } else {
                 dec_size = opus_decode(call->cs->audio_decoder, _msg->data, _msg->length, dest, frame_size, 0);
                 rtp_free_msg(NULL, _msg);
             }
 
-            if(dec_size < 0) {
+            if (dec_size < 0) {
                 LOGGER_WARNING("Decoding error: %s", opus_strerror(dec_size));
                 continue;
             }
@@ -784,7 +784,7 @@ void toxav_handle_packet(RTPSession *_session, RTPMessage *_msg)
         uint8_t *packet = _msg->data;
         int recved_size = _msg->length;
 
-        if(recved_size < VIDEOFRAME_HEADER_SIZE) {
+        if (recved_size < VIDEOFRAME_HEADER_SIZE) {
             goto end;
         }
 
@@ -824,11 +824,13 @@ void toxav_handle_packet(RTPSession *_session, RTPMessage *_msg)
             LOGGER_DEBUG("Limit: %u\n", call->frame_limit);
         }
 
-        end:;
+end:
+        ;
         vpx_codec_iter_t iter = NULL;
         vpx_image_t *img;
         img = vpx_codec_get_frame(&call->cs->v_decoder, &iter);
-        if(img) {
+
+        if (img) {
             av->video_callback(av, call_index, img);
         }
 
diff --git a/toxav/toxav.h b/toxav/toxav.h
index 6a35fccf..0ded42bd 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -170,7 +170,7 @@ void toxav_register_callstate_callback (ToxAVCallback callback, ToxAvCallbackID
  * @param callback The callback
  * @return void
  */
-void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int32_t, int16_t*, int));
+void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, int16_t *, int));
 
 /**
  * @brief Register callback for recieving video data
@@ -178,7 +178,7 @@ void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int
  * @param callback The callback
  * @return void
  */
-void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int32_t, vpx_image_t*));
+void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, vpx_image_t *));
 
 /**
  * @brief Call user. Use its friend_id.