mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
ee2a43798c
* commit '676856204b84dfaffe329dce8502e834a0dbdb19': DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride Conflicts: libavcodec/dnxhdenc.h libavcodec/x86/dnxhdenc_init.c See: cb11b9e89e152ed4db22e5ad0349b63fac02101e 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.