diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-03-01 23:39:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-03-01 23:39:33 +0000 |
| commit | dcacf91a98cefe4776757708ab65152acd65ba94 (patch) | |
| tree | 7fc9ea502aca8794e26e4c6822858fedb790d7f6 /src | |
| parent | a249eedcaf39c72b710f7edb65140c30f958f5ff (diff) | |
Remove unused parameter; set audio frame size from the video/audio frame rates.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg_encoder.cc | 6 |
1 files 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<PlayerVideo> video, DCPTime time) /** Called when the player gives us some audio */ void -FFmpegEncoder::audio (shared_ptr<AudioBuffers> audio, DCPTime) +FFmpegEncoder::audio (shared_ptr<AudioBuffers> 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) { |