[FFmpeg-cvslog] Merge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 20 13:34:27 2012 +0100| [70c0f13a9a40323456d8810a7a1ee0a6256c3384] | committer: Michael Niedermayer

Merge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a'

* commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a':
  alacenc: support 24-bit encoding
  pcmdec: use planar sample format for pcm_s16le_planar
  vorbisdec: use float planar sample format

Conflicts:
	libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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