32da2fd422651f1f36f26975685cb7f7ff5a678b
* commit '1df0b061621b10edde87e3ab7ea83aed381c574f': nuv: Reuse the DSPContext from RTJpegContext Conflicts: libavcodec/nuv.c 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.
Languages
Diff
100%