Fix ffmpeg v4 stream issue (#20314)

* 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 authored and GitHub committed 2019-02-04 09:57:22 -08:00
1 parent a40c5bf70e
commit 7455d950b1
11 files changed
+41 -12

No files matched your search

+1 -1
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()