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)
commite4198d2fc3d98d076240530e095608272671f61d
tree2052e35886a69bf0311da8d4250932a88695180d
parent5c616fe48bf65a04a8a708848414f7c2b9c928f7
parent9fac752afa96b1f52329c6233111549ceb0f9207
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: simplify and fix flushing out old subtitles on seeking

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