Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Jan 2015 19:19:51 +0000 (20:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Jan 2015 19:19:56 +0000 (20:19 +0100)
commit8009a51f7bbd90e2a8806be2d8f49f0684037bdb
tree6ac7b78941635688cada93002112767720863735
parentefc4bfc195dab6efa77b444eac9313df4596a922
parent46aa75eea1bd68c0e1224ef9ce640b05818572f9
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: dump format before selecting streams
  ffplay: add support for stream specifiers in -ast, -vst, -sst options
  ffplay: remove unused no_background from videostate
  ffplay: remove flushed state from decoder context

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