]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c616fe 9fac752)
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
Unnamed repository; edit this file 'description' to name the repository.