Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Sep 2014 20:09:50 +0000 (22:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Sep 2014 20:09:54 +0000 (22:09 +0200)
* cus/stable:
  ffplay: move pts calculating code to generic decoder
  ffplay: factorize decoder functions to generic decoder
  ffplay: handle fullscreen status on resize event

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

Trivial merge