summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-10-15 22:33:46 +0200
committerCarl Hetherington <cth@carlh.net>2021-10-16 10:13:26 +0200
commitc8fa584045ad65283a85015f18ee8789ddf881d1 (patch)
tree9887fe131c628a27555afcf705c565ba91ad9c16 /src/lib/ffmpeg_encoder.cc
parent0e896f9f37db001f34c876ed5fc50e874f96ae09 (diff)
Always block waiting for audio when exporting.v2.15.169
Otherwise if there is non available we'll insert silence and potentially push the audio out of sync (late). May help with #2098.
Diffstat (limited to 'src/lib/ffmpeg_encoder.cc')
-rw-r--r--src/lib/ffmpeg_encoder.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index e1081f518..81ea3a9dd 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -204,7 +204,7 @@ FFmpegEncoder::go ()
waker.nudge ();
- _butler->get_audio (interleaved, audio_frames);
+ _butler->get_audio (Butler::Behaviour::BLOCKING, interleaved, audio_frames);
/* XXX: inefficient; butler interleaves and we deinterleave again */
float* p = interleaved;
for (int j = 0; j < audio_frames; ++j) {