diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavdevice/jack_audio.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavdevice/jack_audio.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/third_party/ffmpeg/libavdevice/jack_audio.c b/chromium/third_party/ffmpeg/libavdevice/jack_audio.c index 5ba67316821..759ef9bcdfb 100644 --- a/chromium/third_party/ffmpeg/libavdevice/jack_audio.c +++ b/chromium/third_party/ffmpeg/libavdevice/jack_audio.c @@ -163,7 +163,7 @@ static int start_jack(AVFormatContext *context) sem_init(&self->packet_count, 0, 0); self->sample_rate = jack_get_sample_rate(self->client); - self->ports = av_malloc(self->nports * sizeof(*self->ports)); + self->ports = av_malloc_array(self->nports, sizeof(*self->ports)); self->buffer_size = jack_get_buffer_size(self->client); /* Register JACK ports */ @@ -206,14 +206,14 @@ static int start_jack(AVFormatContext *context) } -static void free_pkt_fifo(AVFifoBuffer *fifo) +static void free_pkt_fifo(AVFifoBuffer **fifo) { AVPacket pkt; - while (av_fifo_size(fifo)) { - av_fifo_generic_read(fifo, &pkt, sizeof(pkt), NULL); + while (av_fifo_size(*fifo)) { + av_fifo_generic_read(*fifo, &pkt, sizeof(pkt), NULL); av_free_packet(&pkt); } - av_fifo_free(fifo); + av_fifo_freep(fifo); } static void stop_jack(JackData *self) @@ -224,8 +224,8 @@ static void stop_jack(JackData *self) jack_client_close(self->client); } sem_destroy(&self->packet_count); - free_pkt_fifo(self->new_pkts); - free_pkt_fifo(self->filled_pkts); + free_pkt_fifo(&self->new_pkts); + free_pkt_fifo(&self->filled_pkts); av_freep(&self->ports); ff_timefilter_destroy(self->timefilter); } @@ -333,6 +333,7 @@ static const AVClass jack_indev_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT, }; AVInputFormat ff_jack_demuxer = { |