aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/asf.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-26 14:45:36 -0300
committerJames Almer <jamrial@gmail.com>2017-10-26 14:46:31 -0300
commit4576ee100b9e645ff3a63e36c500ea4b3001a198 (patch)
tree4b947af4cc5247c3d850fa0e0993f3ab4608be6d /libavformat/asf.c
parent4c0426c478dc452df2a4b4c27cf7622bd0ff4279 (diff)
parent3d197514e613ccd9eab43180c0a7c8b09a307606 (diff)
downloadffmpeg-4576ee100b9e645ff3a63e36c500ea4b3001a198.tar.gz
Merge commit '3d197514e613ccd9eab43180c0a7c8b09a307606'
* commit '3d197514e613ccd9eab43180c0a7c8b09a307606': qsvenc: Allow use of hw_device_ctx to make the internal session qsvdec: Allow use of hw_device_ctx to make the internal session qsv: Add ability to create a session from a device doc: Add VAAPI encoders vaapi_encode: Add VP9 support vp9: Add bsf to fix reordering in raw streams This commit is a noop, see 49419925d33304ff907075289808226a695ff57b bde04604065db565373c315ad13d9c3c5db4d7c9 dc81f1a2cef11538401ee1ca13b76e61838283e6 91c3b50d74ba8874ea090c29063f953f4cc90ba9 8aa3c2df1ae64b4b30462cc8a164520e65312d1a 28aedeed1961392d6b27f2f3abe4fd4c33393b93 Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/asf.c')
0 files changed, 0 insertions, 0 deletions