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

Fix ffmpeg v4 stream issue (#20314)

Browse source 
* Add ffmpeg version

* Add ffmpeg stream content type

* Change ffmpeg camera stream content type

* Change ffmpeg stream content type

* Lint

* Add a none guard

* Fix

* Fix

* Update onvif.py

* Fix version match regrex

* Fix regrex

* Upgrade ha-ffmpeg to 1.11

* Lint

* Get ffmpeg version in ffmpeg component setup
This commit is contained in:
Jason Hu 2019-02-04 09:57:22 -08:00 • committed by GitHub
parent a40c5bf70e
commit 7455d950b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 41 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/camera/ffmpeg.py
View file

@ -68,7 +68,7 @@ class FFmpegCamera(Camera):
try:
return await async_aiohttp_proxy_stream(
self.hass, request, stream,
'multipart/x-mixed-replace;boundary=ffserver')
self._manager.ffmpeg_stream_content_type)
finally:
await stream.close()