Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Jun 2013 00:01:38 +0000 (02:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Jun 2013 00:01:44 +0000 (02:01 +0200)
* cus/stable:
  ffplay: simplify and fix flushing out old subtitles on seeking

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

Trivial merge