More fixes to when to pull from the audio merger.
authorCarl Hetherington <cth@carlh.net>
Wed, 22 Feb 2017 14:09:50 +0000 (14:09 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 19 Apr 2017 22:04:32 +0000 (23:04 +0100)
commitc20b1952c9a3187b91ce49423fa8093fcf9661bc
treefa0777ea1ed590206840a414d37c5b005e7ab9b8
parentb20c4b11abff0bd57dab03174070ec8571bbe4d5
More fixes to when to pull from the audio merger.
src/lib/player.cc
src/lib/transcoder.cc