diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:24:04 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:24:04 +0000 |
commit | cb0355537d6a89fc71fbc672ad5dba8a1eadce34 (patch) | |
tree | 111a7e3e125acc80d3a06b9cbfdfbc05aea35b29 /libavcodec/xsubenc.c | |
parent | 0d4c0240affc09eb2c9f6ccacac2ed14321b1e34 (diff) | |
parent | d847a40888c064cc8c35b546fc5a0ccb69136a7c (diff) | |
download | ffmpeg-cb0355537d6a89fc71fbc672ad5dba8a1eadce34.tar.gz |
Merge commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c'
* commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c':
hwcontext_cuda/vdpau: add to skipheaders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/xsubenc.c')
0 files changed, 0 insertions, 0 deletions