f924d6e40b
* commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f': mxfdec: set extradata size Conflicts: libavformat/mxfdec.c no change as ffmpeg was not affected by this bug 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.