50df56161f
* qatar/master: dirac: use meaningful return values flacdec: simplify sample buffer handling flacdec: simplify loop in decode_residuals() fate: make Ut Video encoder tests use bitexact swscale flags build: amrwb: Drop redundant lsp dependency declaration fate: fix utvideoenc tests Conflicts: libavcodec/dirac.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.