* 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>