Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jan 2012 00:20:32 +0000 (01:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jan 2012 00:33:35 +0000 (01:33 +0100)
commit4a4c4278b716b49b9f1653df4ac4f1f026606081
treee1f9e2855fb0dc8a836ff795bd0eb95b48af30bd
parentf94ce3bcab67369b18976f6cf8e69ae132805213
parent2df5f59ad0710a0d85114b73bd6a5094c26d08bc
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: split ADPCM and DPCM test references into separate files.
  mov, mxfdec: Employ more meaningful return values.
  lavc: Relax API strictness in avcodec_decode_audio3 with a custom get_buffer()
  wavpack: fix clipping for 32-bit lossy mode
  vb: Use bytestream2 functions

Conflicts:
libavcodec/utils.c
libavcodec/vb.c
libavformat/mxfdec.c
tests/fate/dpcm.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/vb.c
libavcodec/wavpack.c
libavformat/mov.c
libavformat/mxfdec.c
tests/Makefile
tests/fate/dpcm.mak