Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Jan 2012 19:33:01 +0000 (20:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Jan 2012 19:33:11 +0000 (20:33 +0100)
* cus/stable:
  ffplay: fix invalid wanted_channel_layout calculation
  ffplay: honor SDL_AUDIO_CHANNELS and make sure to use SDL supported number of audio channels

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

Trivial merge