From: Mike Brady <mikebrady@eircom.net>
Date: Sat, 14 Apr 2018 13:06:09 +0000 (+0100)
Subject: incorporate 3.2d30 stuff -- lots of important bug fixes -- and include the extra... 
X-Git-Tag: 3.2RC3b~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3823f337d07b5035b306c2cc12e4fe0f1c0375f0;p=thirdparty%2Fshairport-sync.git

incorporate 3.2d30 stuff -- lots of important bug fixes -- and include the extra diagnostic information from RC2
---

3823f337d07b5035b306c2cc12e4fe0f1c0375f0
diff --cc player.h
index 56ea1f91,ec4e4248..031813a9
--- a/player.h
+++ b/player.h
@@@ -194,9 -195,9 +195,8 @@@ void player_stop(rtsp_conn_info *conn)
  void player_volume(double f, rtsp_conn_info *conn);
  void player_volume_without_notification(double f, rtsp_conn_info *conn);
  void player_flush(int64_t timestamp, rtsp_conn_info *conn);
- void player_put_packet(seq_t seqno, uint32_t actual_timestamp, int64_t timestamp, uint8_t *data, int len,
-                        rtsp_conn_info *conn);
- 
+ void player_put_packet(seq_t seqno, uint32_t actual_timestamp, int64_t timestamp, uint8_t *data,
+                        int len, rtsp_conn_info *conn);
 -
  int64_t monotonic_timestamp(uint32_t timestamp,
                              rtsp_conn_info *conn); // add an epoch to the timestamp. The monotonic
  // timestamp guaranteed to start between 2^32 2^33