Merge commit '0d4d43513786f1df4d561e1fac924fb0722c6700'

[ffmpeg] / libavdevice / jack.c

diff --git a/libavdevice/jack.c b/libavdevice/jack.c
index 076078ce6de7c3bc37bfda2d2ff54d6b57b92888..e35a4a815aea73fadda3c109094166d3952799b1 100644 (file)
--- 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];