Merge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Nov 2012 12:34:27 +0000 (13:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Nov 2012 12:34:27 +0000 (13:34 +0100)
commit70c0f13a9a40323456d8810a7a1ee0a6256c3384
tree342bb51679733769271a1c441d98cb9d504d225e
parentda8242e2d6f85d95239082efd0e5e2345e685a2c
parent7c278d2ae410a64bdd89f1777026b4b963c30a1a
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@gmx.at>
libavcodec/alacenc.c
libavcodec/pcm.c
libavcodec/vorbisdec.c