0da0caa9a9ea1a2d7471f51a11fd90c08fbcd3fb

* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
vdpau: use the correct namespace for the union
Conflicts:
libavcodec/vdpau.h
See: 68dfe530e0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.
Description
Languages
C
92.1%
Assembly
6%
Makefile
1.2%
C++
0.3%
Objective-C
0.2%
Other
0.1%