mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb'
* commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb': avconv: Document the -init_hw_device option avconv: Enable generic hwaccel support for VDPAU lavc: vdpau: add support for new hw_frames_ctx and hw_device_ctx API lavc: Add hwaccel_flags field to AVCodecContext avconv: Enable generic hwaccel support for VAAPI avconv: Generic device setup hwcontext: Make it easier to work with device types hwcontext: Add device derivation This commit is a noop, seeb22172f6f3
0b1794a43e
06043cc0bc
be51073352
156bd8278f
7e4ba776a2
e462ace84b
527a1e2131
Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
9cfdf0e332