e9125dd556
* commit '2c10e2a2f62477efaef5b641974594f7df4ca339': build: Make the H.264 parser select h264qpel x86: h264qpel: add cpu flag checks for init function Conflicts: libavcodec/x86/h264_qpel.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.