• Michael Niedermayer's avatar
    Merge commit 'bfcd4b6a' · e88ca80d
    Michael Niedermayer authored
    * commit 'bfcd4b6a':
      adpcmdec: set AVCodec.sample_fmts
      twinvq: use planar sample format
      ralf: use planar sample format
      mpc7/8: use planar sample format
      iac/imc: use planar sample format
      dcadec: use float planar sample format
      cook: use planar sample format
      atrac3: use float planar sample format
      apedec: output in planar sample format
      8svx: use planar sample format
    
    Conflicts:
    	libavcodec/8svx.c
    	libavcodec/dcadec.c
    	libavcodec/mpc7.c
    	libavcodec/mpc8.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e88ca80d
mpc7.c 11.5 KB