diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:36:27 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:36:27 +0200 |
commit | 4e6f2dbcd3ca0cee45a174ed8e50038810f7177b (patch) | |
tree | a59c7c8573fe4b41e809197c0e4fdd91b33d78e9 /libavformat/asf.c | |
parent | 06a0e184359b75c3534bb88b08233efa53be8397 (diff) | |
parent | 9f7590f4e497c12693247d7f935a20d7773a64dd (diff) | |
download | ffmpeg-4e6f2dbcd3ca0cee45a174ed8e50038810f7177b.tar.gz |
Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'
* commit '9f7590f4e497c12693247d7f935a20d7773a64dd':
avconv_vaapi: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/asf.c')
0 files changed, 0 insertions, 0 deletions