Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Jun 2012 15:06:02 +0000 (17:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Jun 2012 15:06:09 +0000 (17:06 +0200)
* cus/stable:
  ffplay: remove VideoPicture pix_fmt and use frame pixel format instead
  ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8
  ffplay: add pause audio feature in the middle of a packet
  ffplay: remove VideoPicture duration field

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

Trivial merge