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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  9 04:49:56 2013 +0200| [93e8fcb94b1ae3e1cb9be1164bb098b3ed188a11] | committer: Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: simplify video pts calculation
  ffplay: fix indentation
  ffplay: handle audio buffersink output properly with buffering filters
  ffplay: set time_base of audio filter buffer src

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

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