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)
commit4d5bbbadd7cd8ffb672fb69147da8dfbde5255fa
tree76f0203fe2088bfb19a2e75dcd24fe3fd482f9c3
parent7f83db312454b3673a4dfd34745428f61309ab30
parent8ee77fc8d4034924c4151304e274bf65809aec39
Merge remote-tracking branch 'cus/stable'

* 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>