[FFmpeg-cvslog] Merge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  2 16:25:58 2012 +0200| [e88ca80dc325a0291c64e1dd3245c4943397cfa3] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e88ca80dc325a0291c64e1dd3245c4943397cfa3
---