• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 75f847aa
    Michael Niedermayer authored
    * qatar/master:
      avplay: use libavresample for sample format conversion and channel mixing
      Fix compilation with YASM/NASM without AVX support.
      WMAL: do not output last frame again if nothing was decoded in current packet
      WMAL: do not start decoding if frame does not end in current packet
      adpcm-thp: fix invalid array indexing
      ppc: add const where needed in scalarproduct_int16_altivec()
      ppc: remove shift parameter from scalarproduct_int16_altivec()
      ppc: dsputil: do unaligned block accesses correctly
      dvenc: do not call dsputil functions with stride not a multiple of 16
      APIchanges: fill in some dates and commit hashes
    
    Conflicts:
    	doc/APIchanges
    	ffplay.c
    	libavcodec/adpcm.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    75f847aa
adpcm.c 48.8 KB