• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4a4c4278
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4a4c4278
dpcm.mak 254 Bytes