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)
* 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>

Trivial merge