Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavdevice / jack_audio.c

diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c
index b1077c4ebedd3a3860ff2a1baf78dca63229f560..257a29175822f5ad018e68fdb2233e1d599b53cf 100644 (file)
--- a/libavdevice/jack_audio.c
+++ b/libavdevice/jack_audio.c
@@ -222,7 +222,7 @@ static void stop_jack(JackData *self)
     ff_timefilter_destroy(self->timefilter);
 }
 
-static int audio_read_header(AVFormatContext *context, AVFormatParameters *params)
+static int audio_read_header(AVFormatContext *context)
 {
     JackData *self = context->priv_data;
     AVStream *stream;
@@ -272,7 +272,7 @@ static int audio_read_packet(AVFormatContext *context, AVPacket *pkt)
         }
     }
 
-    /* Wait for a packet comming back from process_callback(), if one isn't available yet */
+    /* Wait for a packet coming back from process_callback(), if one isn't available yet */
     timeout.tv_sec = av_gettime() / 1000000 + 2;
     if (sem_timedwait(&self->packet_count, &timeout)) {
         if (errno == ETIMEDOUT) {