X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavdevice%2Fjack_audio.c;h=257a29175822f5ad018e68fdb2233e1d599b53cf;hb=e37f161e66e042d6c2c7470c4d9881df9427fc4a;hp=42499d363b05f36ae6ea07e01319e5e8fd733075;hpb=d8cab5c26b0987f139830937e1f30b2a10822680;p=ffmpeg diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c index 42499d363b0..257a2917582 100644 --- a/libavdevice/jack_audio.c +++ b/libavdevice/jack_audio.c @@ -29,6 +29,7 @@ #include "libavutil/opt.h" #include "libavcodec/avcodec.h" #include "libavformat/avformat.h" +#include "libavformat/internal.h" #include "timefilter.h" #include "avdevice.h" @@ -221,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; @@ -245,7 +246,7 @@ static int audio_read_header(AVFormatContext *context, AVFormatParameters *param stream->codec->sample_rate = self->sample_rate; stream->codec->channels = self->nports; - av_set_pts_info(stream, 64, 1, 1000000); /* 64 bits pts in us */ + avpriv_set_pts_info(stream, 64, 1, 1000000); /* 64 bits pts in us */ return 0; } @@ -271,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) {