39de8343f9
* qatar/master: mkv: mark corrupted packets and return them mkv: forward EMBL block data error avcodec: introduce YCoCg colorspace avcodec: cosmetic cleanup on header aac sbr: align struct member by 32 byte. Conflicts: libavcodec/avcodec.h libavformat/matroskadec.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.