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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov  6 10:58:58 2013 +0100| [1b3d3a9c87f138b92f26a8b34873913b94f8999a] | committer: Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add smarter method for determining video picture duration
  ffplay: add frame duration estimated from frame rate to VideoPicture
  ffplay: avoid code duplication in AVFILTER enabled and disabled case

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

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