abf91f7fee
* commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e': cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52 h264: Fix parameters to ff_er_add_slice() call h264: always check ref_count for validity Conflicts: libavcodec/h264.c libavutil/cpu.h 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.