summaryrefslogtreecommitdiff
path: root/src/lib/encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-21 13:20:51 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-21 13:20:51 +0100
commit5a57b5631518ce9711e6b44a65a0bb87aa434561 (patch)
tree2db1403b5b3a30ae5b15cfcf23ae34fdef380de4 /src/lib/encoder.cc
parent5f0f0de782100a5cb558f30c7768c8af0c19bcb7 (diff)
parentdc6713f19bb9084aac18eabe399b14ca1ac26df9 (diff)
Merge branch 'sync-fixes' into staging
Diffstat (limited to 'src/lib/encoder.cc')
-rw-r--r--src/lib/encoder.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index cff9899ac..8549962ff 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -296,6 +296,10 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, boost::shared_
void
Encoder::process_audio (shared_ptr<const AudioBuffers> data)
{
+ if (!data->frames ()) {
+ return;
+ }
+
#if HAVE_SWRESAMPLE
/* Maybe sample-rate convert */
if (_swr_context) {