Merge branch 'master' of github.com:albertz/shairport

2011-04-15 15:27:13 +02:00
parent 2fbfd2782b f4addf902d
commit 8a03e501f7
1 changed files with 4 additions and 2 deletions
@@ -432,7 +432,9 @@ int init_rtp(void) {
    si.sin6_flowinfo = 0;
 #else
    si.sin_family = AF_INET;
-    si.sin_len = sizeof(si);
+    #ifdef SIN_LEN
+        si.sin_len = sizeof(si);
+    #endif
    si.sin_addr.s_addr = htonl(INADDR_ANY);
 #endif

@@ -639,7 +641,7 @@ int stuff_buffer(double playback_rate, short *inptr, short *outptr) {
        }
    }

-    return stuffsamp;
+    return frame_size + stuff;
 }

 void *audio_thread_func(void *arg) {