Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2016-09-28 20:34:05 -07:00
commit 8a8e6e9c1f
52 changed files with 304 additions and 108 deletions

View file

@ -22,7 +22,7 @@ To enable your FFmpeg with noise detection in your installation, add the followi
```yaml
# Example configuration.yaml entry
camera:
binary_sensor:
- platform: ffmpeg
tool: noise
input: FFMPEG_SUPPORTED_INPUT
@ -57,7 +57,7 @@ To enable your FFmpeg with motion detection in your installation, add the follow
```yaml
# Example configuration.yaml entry
camera:
binary_sensor:
- platform: ffmpeg
tool: motion
input: FFMPEG_SUPPORTED_INPUT