diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-15 18:36:30 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-15 18:36:30 +0200 |
| commit | d40e181bec22014a9ea312ab6837f7f0bc4f9e42 (patch) | |
| tree | 975e70752b71603d0e89467702dfcd4bf4beed74 /libavformat/unix.c | |
| parent | 9e86a61870c1652cdcc6a34646aee40d973ba23b (diff) | |
| parent | 932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a (diff) | |
| download | ffmpeg-d40e181bec22014a9ea312ab6837f7f0bc4f9e42.tar.gz | |
Merge commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'
* commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a':
vdpau: Do not #include vdpau_x11.h from the main vdpau header
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/unix.c')
0 files changed, 0 insertions, 0 deletions