Merge branch 'master' into aac

diff --git a/ortp_send.c b/ortp_send.c
index 07e3cccfbc65423bcd0455d1b9eb5617fbbe1c91..9363d74e79f4b85e990a5c667655dd68dc6eb77a 100644 (file)
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -75,9 +75,7 @@ static void ortp_send_buf(char *buf, int len, long unsigned chunks_sent)
        int ret;
 
        list_for_each_entry_safe(ot, tmp, &targets, node) {
-               struct timeval now;
                int ts;
-               gettimeofday(&now, NULL);
                if (!ot->session)
                        continue;
                WRITE_CHUNK_TS(buf, ot->chunk_ts);

diff --git a/server.c b/server.c
index 6f70d977d0814e0c7fa5a54581baf405397ea259..caa32d8ef3f77e94d68aa57cdc7283c41725cb07 100644 (file)
--- a/server.c
+++ b/server.c
@@ -477,10 +477,8 @@ repeat:
                        &afl[mmd->audio_format] : NULL,
                        &rfds, &wfds);
        }
-       if (!ret) {
-               afs_send_chunk();
-               status_refresh();
-       }
+       afs_send_chunk();
+       status_refresh();
        if (FD_ISSET(signal_pipe, &rfds)) {
                int sig;
                sig = para_next_signal();