evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfix if ffmpeg is not present on config / Update ha-ffmpeg 0.13 (#3418)

Browse source
This commit is contained in:
Pascal Vizeli 2016-09-18 07:57:18 +02:00 • committed by Paulus Schoutsen
parent 81928b1a6b
commit 534f56a3e2
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
homeassistant/components/ffmpeg.py
View file

@ -11,7 +11,7 @@ import voluptuous as vol
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
DOMAIN = 'ffmpeg' DOMAIN = 'ffmpeg'
REQUIREMENTS = ["ha-ffmpeg==0.12"] REQUIREMENTS = ["ha-ffmpeg==0.13"]
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -32,15 +32,17 @@ CONFIG_SCHEMA = vol.Schema({
}, extra=vol.ALLOW_EXTRA) }, extra=vol.ALLOW_EXTRA)
FFMPEG_CONFIG = {} FFMPEG_CONFIG = {
CONF_FFMPEG_BIN: DEFAULT_BINARY,
CONF_RUN_TEST: DEFAULT_RUN_TEST,
}
FFMPEG_TEST_CACHE = {} FFMPEG_TEST_CACHE = {}
def setup(hass, config): def setup(hass, config):
"""Setup the FFmpeg component.""" """Setup the FFmpeg component."""
global FFMPEG_CONFIG if DOMAIN in config:
FFMPEG_CONFIG.update(config.get(DOMAIN))
FFMPEG_CONFIG = config.get(DOMAIN)
return True return True

2
requirements_all.txt
View file

@ -115,7 +115,7 @@ googlemaps==2.4.4
gps3==0.33.3 gps3==0.33.3
# homeassistant.components.ffmpeg # homeassistant.components.ffmpeg
ha-ffmpeg==0.12 ha-ffmpeg==0.13
# homeassistant.components.mqtt.server # homeassistant.components.mqtt.server
hbmqtt==0.7.1 hbmqtt==0.7.1