diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-31 11:31:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-31 11:31:19 +0200 |
| commit | f8201cc18b30ae0126376d4e8ea583ef6af0c0d4 (patch) | |
| tree | c83e498225265d89091042b2b13689f6b3cd1f24 /libavcodec/ansi.c | |
| parent | 29667a2c2014a54cf05f8106c45ad78be5228fd0 (diff) | |
| parent | f2f57d16795efa8083acef17c640bea6c08aa638 (diff) | |
| download | ffmpeg-f8201cc18b30ae0126376d4e8ea583ef6af0c0d4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/platform: Remove part about dllimport
vp8: Fix pthread_cond and pthread_mutex leaks
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ansi.c')
0 files changed, 0 insertions, 0 deletions