From dcacf91a98cefe4776757708ab65152acd65ba94 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 1 Mar 2018 23:39:33 +0000 Subject: [PATCH] Remove unused parameter; set audio frame size from the video/audio frame rates. --- src/lib/ffmpeg_encoder.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 6b41cfbe0..7e51ba19f 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -216,7 +216,7 @@ FFmpegEncoder::go () deinterleaved->data(k)[j] = *p++; } } - audio (deinterleaved, i); + audio (deinterleaved); } delete[] interleaved; @@ -327,14 +327,14 @@ FFmpegEncoder::video (shared_ptr video, DCPTime time) /** Called when the player gives us some audio */ void -FFmpegEncoder::audio (shared_ptr audio, DCPTime) +FFmpegEncoder::audio (shared_ptr audio) { _pending_audio->append (audio); int frame_size = _audio_codec_context->frame_size; if (frame_size == 0) { /* codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE */ - frame_size = 2000; + frame_size = _film->audio_frame_rate() / _film->video_frame_rate(); } while (_pending_audio->frames() >= frame_size) { -- 2.30.2