From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 23 Sep 2014 20:09:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'cus/stable'
X-Git-Tag: n2.6-dev~1375
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/55179987e7676dcb4df5acda2173185787cb01aa

Merge remote-tracking branch 'cus/stable'

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

55179987e7676dcb4df5acda2173185787cb01aa