* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2': vdpau: use the correct namespace for the union Conflicts: libavcodec/vdpau.h See: 68dfe530e0fb03b4d21dfe37f8a572b95c68485e 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
90.6%
Assembly
7.5%
Makefile
1.3%
C++
0.2%
Objective-C
0.1%
Other
0.1%