Merge branch '2004'

Authored by mardelle on May 7 2020, 8:31 AM.

Description

Merge branch '2004'

Merged Changes

CommitAuthorDetailsCommitted
c2d7a770c64dmardelle
Proxy clips: fix vaapi_h264 profile and ensure we keep the stream order… 
May 7 2020