Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Nov 2013 09:58:58 +0000 (10:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Nov 2013 09:59:03 +0000 (10:59 +0100)
commit1b3d3a9c87f138b92f26a8b34873913b94f8999a
treeef9f2b25cf73bdecae4ae3f94124d124f626fca0
parent66872161cbb7187b0c20267653d415ef700aca35
parent5ecfcc7dff04ff0e86d8b6b3a33709ae956dfef7
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@gmx.at>