diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-17 00:40:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-17 00:41:07 +0200 |
| commit | 83438a0db3c61f06979d1c4159e5c85d52eda488 (patch) | |
| tree | e2f396838b231df9c36adc6aed4eda731d9babb5 /libavfilter/avfilter.c | |
| parent | a593f5bd9db642801fad5ca535a1d843e8f27e86 (diff) | |
| parent | d8f8e911bd5efbd02dd34e9c5097df6828f4c603 (diff) | |
| download | ffmpeg-83438a0db3c61f06979d1c4159e5c85d52eda488.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: dont wait 100ms if data is not yet ready
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
0 files changed, 0 insertions, 0 deletions