Michael Niedermayer
952614b899
* commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560': dcadec: Do not decode the XCh extension when downmixing to stereo Conflicts: libavcodec/dcadec.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.