Merge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Oct 2012 14:25:58 +0000 (16:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Oct 2012 15:27:52 +0000 (17:27 +0200)
commite88ca80dc325a0291c64e1dd3245c4943397cfa3
treedf8abbc8d6defc5bf10932ed096ec18cd979d0eb
parent82db8ee3211014a38db6b8cae03f1c3246938eee
parentbfcd4b6a1691d20aebc6d2308424c2a88334a9f0
Merge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'

* commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0':
  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: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libavcodec/8svx.c
libavcodec/adpcm.c
libavcodec/apedec.c
libavcodec/atrac3.c
libavcodec/cook.c
libavcodec/dcadec.c
libavcodec/imc.c
libavcodec/mpc.c
libavcodec/mpc.h
libavcodec/mpc7.c
libavcodec/mpc8.c
libavcodec/twinvq.c