mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-11-06 21:04:45 +03:00
fe54f6cb45
* commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3': h264: Copy h264chroma dsp context to slice thread copies swscale: Disallow conversion to GBRP16 Conflicts: libswscale/utils.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip 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.