9eb99ab25b
* qatar/master: fate: employ better names and add a convenient shorthand for vp6 tests arm/neon: dsputil: use correct size specifiers on vld1/vst1 arm: dsputil: prettify some conditional instructions in put_pixels macros vqavideo: change x/y loop counters to the usual pattern avconv: use lrint() for rounding double timestamps Conflicts: tests/ref/fate/vc1-ism 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.