[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  2 17:06:02 2012 +0200| [1bf22c3a8faf478255712ea95070d948d7614b8d] | committer: Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* 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 at gmx.at>

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