incorporate 3.2d30 stuff -- lots of important bug fixes -- and include the extra...

diff --cc player.h
index 56ea1f9105b7247e1b72d1b5e7bd4dc0b8a35115,ec4e42481bac29e08ffa451d17316bcca01b8e6a..031813a9ff8994fceee6b071c6ce1ece6d971354
--- 1/player.h
--- 2/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