Changeset e4198d2f in ffmpeg

Timestamp:

Jun 27, 2013, 12:01:44 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

42bd0cd2

Parents:

5c616fe4 (diff), 9fac752a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/27/13 00:01:38)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/27/13 00:01:44)

Message:

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>

(No files)