diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-05 10:32:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-05 11:14:29 +0100 |
| commit | e1459f4b0bb2482c40b458183f78feadb8fe417b (patch) | |
| tree | 7ad4420ff057438e5c754bb13a0cc2d0fb9fd39b /tools/zmqshell.py | |
| parent | 934e489ee8f48cfe8ba18c57a9708b830b613c4d (diff) | |
| parent | 70cbf33405f50dfaf77e85f382a188acf17dc71a (diff) | |
| download | ffmpeg-e1459f4b0bb2482c40b458183f78feadb8fe417b.tar.gz | |
Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'
* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
vdpau: Add missing #includes to fix standalone header compilation
Conflicts:
libavcodec/vdpau_internal.h
Not completely merged as this would break use of vdpau.h from C++
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/zmqshell.py')
0 files changed, 0 insertions, 0 deletions