mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-01-11 22:29:46 +00:00
Michael Niedermayer
53feab7a4e
Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'
* commit '9047491f8bcd87673eed55fb310647a03b0981e9': swscale: add nv12/nv21->yuv420 converter Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb_template.c See: ef627bf9ecddfa888d4c6e4fd633852798c3b4a9 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
Fork of FFmpeg for xenia's usage. Branched from latest release. On changes use a git rebase strategy when applicable!
Languages
C
91.6%
Assembly
6.5%
Makefile
1.3%
C++
0.2%
Objective-C
0.1%