222e7549a7
* commit '7933039ade01b39638ec3d9e638b6ae06ee84984': af_resample: preserve frame properties avconv: Do not divide by zero dca: replace some memcpy by AV_COPY128 h264: avoid undefined behavior in chroma motion compensation x86: dsputil: Use correct file name as multiple inclusion guard Conflicts: ffmpeg.c All changes are already in our 2.2 branch, this is just for metadata 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.