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-15 22:42:48 +0200
commit4d0356840c2f400b0376230a3d07f57897275f99 (patch)
treebb8468a24a2d13383085224c9d383b7664bb4db8 /src/lib/ffmpeg_encoder.cc
parenta3c663012ae1134bef0c36304d71ab319114cfcb (diff)
Always block waiting for audio when exporting.
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 d29e191ed..6dc3a83d4 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.data(), audio_frames);
+ _butler->get_audio (Butler::Behaviour::BLOCKING, interleaved.data(), audio_frames);
/* XXX: inefficient; butler interleaves and we deinterleave again */
float* p = interleaved.data();
for (int j = 0; j < audio_frames; ++j) {