Changeset f524b118 in ffmpeg

Timestamp:

Oct 16, 2011, 9:42:41 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

266172aa

Parents:

fd6af537 (diff), 72776adf (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> (10/16/11 21:42:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/16/11 21:42:41)

Message:

Merge remote-tracking branch 'cus/stable'

• cus/stable: ffplay: avoid window resize crash on osx with libsdl 1.2.14 ffplay: add delay multiple times to frame_timer if it is less than current time ffplay: remove early frame drop functionality ffplay: calculate target clock dynamically, make code more readable

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

(No files)