diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 23:32:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 23:32:09 +0100 |
| commit | 86a423d2b8c62ca11070b4d67df9cb838e887fa4 (patch) | |
| tree | 8477df1992c2a559e52efddfb4549c6fa397d771 /libswresample/audioconvert.c | |
| parent | a26bfc444d256585a9c084cc89ac0f983241755a (diff) | |
| parent | 3736b13753921fd576080ea4e328ff80bb0abf9b (diff) | |
| download | ffmpeg-86a423d2b8c62ca11070b4d67df9cb838e887fa4.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8:
Changelog for 0.8.10
pthread: Avoid spurious wakeups
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/audioconvert.c')
0 files changed, 0 insertions, 0 deletions