36e2ec40688d0c3c350d31fae00a54f6a23b7647
* commit 'f7d228676cb7669059889c4225c8a8dc56708c24': mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.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%