diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-16 23:42:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-16 23:42:41 +0200 |
| commit | f524b1184e94cf1ffff15f4f393172a73bb4b7f6 (patch) | |
| tree | b0013ce03a7339ec88635ad988a61ae025ca66fb /libavcodec/sgienc.c | |
| parent | fd6af5375bcf3f78c61e4b0ca2e4274436746436 (diff) | |
| parent | 72776adfb9f0b856198a770acdec97d523c01208 (diff) | |
| download | ffmpeg-f524b1184e94cf1ffff15f4f393172a73bb4b7f6.tar.gz | |
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>
Diffstat (limited to 'libavcodec/sgienc.c')
0 files changed, 0 insertions, 0 deletions