summaryrefslogtreecommitdiff
path: root/libavdevice
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-24 19:17:02 -0300
committerJames Almer <jamrial@gmail.com>2017-10-24 19:17:02 -0300
commit6821b693ecced16346e901fab5d700e0b9d1d7d8 (patch)
tree4906229bca63ad800cfb64a76392f7c3a5e5b1e6 /libavdevice
parent4e9dc52a9703f84a0e996263018745afa1118aa0 (diff)
parent5a969f64b9cf40bad923c73b66c3031b0018e848 (diff)
Merge commit '5a969f64b9cf40bad923c73b66c3031b0018e848'
* commit '5a969f64b9cf40bad923c73b66c3031b0018e848': jack: Drop support for old (2012) JACK versions Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/jack.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavdevice/jack.c b/libavdevice/jack.c
index 076078ce6d..e35a4a815a 100644
--- a/libavdevice/jack.c
+++ b/libavdevice/jack.c
@@ -94,13 +94,9 @@ static int process_callback(jack_nframes_t nframes, void *arg)
/* Copy and interleave audio data from the JACK buffer into the packet */
for (i = 0; i < self->nports; i++) {
- #if HAVE_JACK_PORT_GET_LATENCY_RANGE
jack_latency_range_t range;
jack_port_get_latency_range(self->ports[i], JackCaptureLatency, &range);
latency += range.max;
- #else
- latency += jack_port_get_total_latency(self->client, self->ports[i]);
- #endif
buffer = jack_port_get_buffer(self->ports[i], self->buffer_size);
for (j = 0; j < self->buffer_size; j++)
pkt_data[j * self->nports + i] = buffer[j];