3245c8b669
* qatar/master: mxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..). x86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro Conflicts: libavformat/mxfdec.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.