Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Aug 2012 14:17:13 +0000 (16:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Aug 2012 14:17:13 +0000 (16:17 +0200)
commit50df56161f42da21a455204b76e17148ac3d9659
treead524d8438b0dc82e7da4bf1aa124024fdcee971
parent26ec392a0e30409fbb0738a5173a9b71a9c99df0
parent72e8d86b19c605f2173b20e56cbc42e032572e08
Merge remote-tracking branch 'qatar/master'

* 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>
libavcodec/Makefile
libavcodec/dirac.c
libavcodec/flacdec.c