]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Oct 2011 21:42:06 +0000 (23:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Oct 2011 21:42:41 +0000 (23:42 +0200)
commitf524b1184e94cf1ffff15f4f393172a73bb4b7f6
treeb0013ce03a7339ec88635ad988a61ae025ca66fb
parentfd6af5375bcf3f78c61e4b0ca2e4274436746436
parent72776adfb9f0b856198a770acdec97d523c01208
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>